Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265		2018-09-13 16:18:28 -04:00
..
css	Add Privacy Statement (#2194)	2018-08-30 13:25:02 -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-09-09 11:36:52 -04:00
js	when refreshing because ajax failed, reload the current view, not just index.php	2018-08-15 17:21:54 -04:00
views	Merge branch 'fix_zms_from_mp4' into h265	2018-09-13 16:18:28 -04:00
skin.php	spacing and google code style	2017-10-12 11:43:31 -07:00