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
..
admin	Fix: Some debugs of module categories	2014-03-18 00:20:39 +01:00
class	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-02 11:41:55 +02:00
categorie.php	Fix: Some debugs of module categories	2014-03-18 00:20:39 +01:00
edit.php	Category extrafields on categories: edit and view	2014-03-16 16:04:18 +01:00
fiche.php	Implement extrafields into category create	2014-03-16 15:25:13 +01:00
index.php	Finnalise categorie contact	2013-07-30 17:24:27 +02:00
photos.php	Fix: form to add images should not show link form	2014-03-18 22:26:46 +01:00
viewcat.php	Category extrafields on categories: edit and view	2014-03-16 16:04:18 +01:00