Isaac Connor 582cbe7567 Merge branch 'master' into multi-server		2015-10-15 09:01:19 -04: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	continue conversion from array to class of Monitor	2015-09-17 16:06:47 -04:00
js	merge master, bump version to 1.28.108	2015-10-01 11:52:49 -04:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'master' into multi-server	2015-10-15 09:01:19 -04: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