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
..
classic	Merge branch 'master' into plugin_support_test	2015-02-25 23:14:25 +01:00
flat	Merge branch 'master' into plugin_support_test	2015-02-25 23:14:25 +01:00
Makefile.am	add flat to the subdirs	2014-12-01 15:57:44 -05:00