Laurent Destailleur 31eb4bda88 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/compta/facture.php

2014-09-06 00:26:11 +02:00

..

admin

Divers

2014-06-16 06:17:46 +02:00

class

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-09-06 00:26:11 +02:00

categorie.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

edit.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

fiche.php

Fix missing $user into create call categorie

2014-09-01 11:51:16 +02:00

index.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

photos.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

traduction.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

viewcat.php

Category extrafields on categories: edit and view

2014-03-16 16:04:18 +01:00