]> www.vanbest.org Git - motioneye-debian/commit
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)
commita07203cdabee7680245bd9a5c5432e3dee1f11cc
tree9efe1d1ce3c82ee0c763148f702aa5ad42536020
parent5ec72dc95b8acfdea25e3a8e9e939f952c34bc3c
parent9f268228f81342ab6dbcbf02759988f93687cbbd
Merge branch 'master' of git@github.com:ccrisan/motioneye.git

Conflicts:
motioneye/server.py