Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas		2016-04-05 12:32:33 -04:00
..
views	Merge branch 'master' into iconnor_video	2016-04-05 09:38:59 -04:00
control.css	rework the ptz controls to take up less vertical space, also don't set width of buttons	2016-04-04 13:20:04 -04:00
export.css	Fixed missing semicolons	2016-01-22 13:31:02 -06:00
skin.css	Merge pull request #1247 from bodegard/master	2016-02-04 11:54:02 -05:00