]> www.vanbest.org Git - motioneye-debian/commitdiff
projects / motioneye-debian / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ec72dc 9f26822)
Merge branch 'master' of git@github.com:ccrisan/motioneye.git
authorCalin Crisan <ccrisan@gmail.com>
Sun, 28 May 2017 09:41:45 +0000 (12:41 +0300)
committerCalin Crisan <ccrisan@gmail.com>
Sun, 28 May 2017 09:41:45 +0000 (12:41 +0300)
Conflicts:
motioneye/server.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.