ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/version

6 lines
50 B
Plaintext
Raw Normal View History

Merge branch 'master' into icon_video
2016-04-06 23:49:40 +08:00
<<<<<<< HEAD
merge all the commits from the messed up iconnor_video branch
2016-04-06 05:14:46 +08:00
1.30.0
Merge branch 'master' into icon_video
2016-04-06 23:49:40 +08:00
=======
bump version from 1.29.0 to 1.29.1
2016-04-06 22:30:47 +08:00
1.29.1
Merge branch 'master' into icon_video
2016-04-06 23:49:40 +08:00
>>>>>>> master