Emmanuel Papin 6b2c435460 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list ... Conflicts: scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in		2015-05-14 11:12:38 +02:00
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	Improve management of plugin options	2015-03-08 13:13:49 +01:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	fix the css .js file name	2015-05-01 16:50:29 -04:00
js	add the new js files for classic flat skins	2015-05-01 16:50:44 -04:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list	2015-05-14 11:12:38 +02: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