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
mobile	Ran script to replace all Short open tags	2014-12-05 10:44:23 +11:00
xml	Merge pull request #359 from knnniggett/eyezm	2014-07-07 17:57:48 -05:00
Makefile.am	remove the flat subdir	2014-12-01 15:55:22 -05:00