Laurent Destailleur 58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into ... BadPixxel-develop Conflicts: htdocs/langs/en_US/categories.lang htdocs/langs/fr_FR/categories.lang		2014-11-15 12:17:46 +01:00
..
admin	Fix several bugs reported by scrutinizer	2014-09-19 14:57:31 +02:00
class	Merge branch 'develop' of github.com:BadPixxel/dolibarr into	2014-11-15 12:17:46 +01:00
card.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-10-12 02:54:34 +02:00
categorie.php	Uniformize position of "Create link" on categories.	2014-10-19 20:37:46 +02:00
edit.php	Migrated old error notifications to the """new""" system	2014-07-20 01:43:46 +02:00
index.php	Miscellaneous fixes	2014-10-16 20:55:13 +02:00
photos.php	removed "thumb\" subdir addition	2014-09-30 19:43:21 +02:00
traduction.php	Migrated old error notifications to the """new""" system	2014-07-20 01:09:43 +02:00
viewcat.php	Fix: CRLF	2014-10-09 17:18:14 +02:00