Laurent Destailleur a7cec18081 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/categories/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/upgrade2.php
	htdocs/product/liste.php

2015-06-14 17:11:36 +02:00

..

admin

Fix several bugs reported by scrutinizer

2014-09-19 14:57:31 +02:00

class

Fix thumbs generation

2015-03-06 13:12:33 +01:00

card.php

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

2015-06-14 17:11:36 +02:00

categorie.php

PHPDoc and misc fixes for several folders

2015-02-10 11:02:11 +01:00

edit.php

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

2015-06-14 17:11:36 +02:00

index.php

Miscellaneous fixes

2014-10-16 20:55:13 +02:00

photos.php

PHPDoc and misc fixes for several folders

2015-02-10 11:02:11 +01:00

traduction.php

Migrated old error notifications to the """new""" system

2014-07-20 01:09:43 +02:00

viewcat.php

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

2015-06-14 17:11:36 +02:00