Laurent Destailleur 7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/opensurvey/public/choix_autre.php		2014-04-02 11:41:55 +02:00
..
categorie.class.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-02 11:41:55 +02:00