Emmanuel Papin 9929233e75 Merge branch 'master' into plugin_support_test ... Conflicts: configure.ac web/lang/fr_fr.php		2015-02-25 23:14:25 +01:00
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	Merge branch 'master' into plugin_support_test	2015-02-25 23:14:25 +01:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	Merge branch 'control_improvements'	2014-12-08 16:52:52 -05:00
js	Merge branch 'master' into plugin_support_test	2015-02-25 23:14:25 +01:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'master' into plugin_support_test	2015-02-25 23:14:25 +01: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