Isaac Connor be0767b4cd Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas		2018-11-06 15:27:17 -05:00
..
css	Use a warning colour when motion detection is disabled.	2018-10-30 12:04:05 -04:00
graphics	upgrade jquery-ui to 1.12.1	2018-02-08 13:19:16 -05:00
includes	Merge branch 'master' into storageareas	2018-10-29 12:52:06 -04:00
js	Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas	2018-11-06 15:27:17 -05:00
views	Merge branch 'audio_only_with_ffmpeg' into storageareas	2018-10-31 14:48:24 -04:00
skin.php	spacing and google code style	2017-10-12 11:43:31 -07:00