Andy Bauer 1aebbec4e8 Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States ... Conflicts: db/zm_create.sql.in db/zm_update-1.28.99.sql		2015-06-27 16:32:32 -05:00
..
classic	Console now shows custom run state in header (if applicable)	2015-06-21 09:31:21 -04:00
mobile	fix montage view issue in mobile skin	2015-06-26 08:47:20 -05:00
xml	add translate function	2015-05-10 08:10:30 -05:00
Makefile.am	remove the flat subdir	2014-12-01 15:55:22 -05:00