Isaac Connor 492550b5ef Merge branch 'storageareas' into newpointone ... Conflicts: scripts/zmaudit.pl.in		2015-12-24 12:36:40 -05:00
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	set default border on live streams so that when they alarm they don't jump around	2015-10-02 10:04:56 -04:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	Merge branch 'one_eighth' into multi-server	2015-12-08 08:47:35 -05:00
js	Merge branch 'storageareas' into newpointone	2015-12-24 12:36:40 -05:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2015-12-24 12:34:55 -05:00
Makefile.am	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
skin.php	Fix builtin authentication issue caused by commit 6e5d927	2014-02-14 18:56:27 -06:00