Laurent Destailleur f81df66564 Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php

2015-09-23 00:34:57 +02:00

..

admin

Code fixes

2015-05-09 14:23:26 +02:00

class

NEW Add color on categories

2015-09-17 20:00:54 +02:00

card.php

NEW Add color on categories

2015-09-17 20:00:54 +02:00

categorie.php

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-09-22 16:28:34 +02:00

edit.php

Merge remote-tracking branch 'origin/3.8' into develop

2015-09-23 00:34:57 +02:00

index.php

Fix style and sql error for field fde.ref not found

2015-08-28 18:20:51 +02:00

photos.php

Added types constants to categories

2015-05-23 18:52:31 +02:00

traduction.php

Added types constants to categories

2015-05-23 18:52:31 +02:00

viewcat.php

NEW Add color on categories

2015-09-17 19:51:56 +02:00