Merge branch 'master' of git@github.com:ccrisan/motioneye.git

author Calin Crisan <ccrisan@gmail.com>

Sat, 20 Feb 2016 16:28:19 +0000 (18:28 +0200)

committer Calin Crisan <ccrisan@gmail.com>

Sat, 20 Feb 2016 16:28:35 +0000 (18:28 +0200)
author Calin Crisan <ccrisan@gmail.com>
Sat, 20 Feb 2016 16:28:19 +0000 (18:28 +0200)
committer Calin Crisan <ccrisan@gmail.com>
Sat, 20 Feb 2016 16:28:35 +0000 (18:28 +0200)
diff --cc motioneye/__init__.py

index 7b7f91609c1144036a52a0b033b5eb3fdcc86fb7,7b7f91609c1144036a52a0b033b5eb3fdcc86fb7..528401c9005e201a2c64b0aac8d4c2ae2d9f32a3
--- 1/motioneye/__init__.py
--- 2/motioneye/__init__.py
+++ b/motioneye/__init__.py
@@@ -1,2 -1,2 +1,2 @@@
   
--VERSION = "0.30"
++VERSION = "0.31-git"
author	Calin Crisan <ccrisan@gmail.com>
	Sat, 20 Feb 2016 16:28:19 +0000 (18:28 +0200)
committer	Calin Crisan <ccrisan@gmail.com>
	Sat, 20 Feb 2016 16:28:35 +0000 (18:28 +0200)