Laurent Destailleur 9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/.gitignore htdocs/core/lib/functions2.lib.php htdocs/install/mysql/migration/repair.sql htdocs/langs/en_US/errors.lang		2014-09-18 10:17:43 +02:00
..
admin	Fix : [ bug #1549 ] Itïs not possible add ExtraFields	2014-08-06 17:38:44 +02:00
ajax	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
canvas	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
class	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-18 10:17:43 +02:00
composition	Migrated old error notifications to the """new""" system	2014-07-20 01:43:46 +02:00
stats	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-15 22:58:39 +02:00
stock	Qual: Removed duplicate page.	2014-09-17 15:24:01 +02:00
document.php	Fix: Can upload files on services.	2014-08-26 23:45:02 +02:00
fiche.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-15 22:58:39 +02:00
fournisseurs.php	Migrated old message notifications to the """new""" system	2014-07-20 00:10:40 +02:00
index.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-15 22:58:39 +02:00
liste.php	Fix: Bad td balance	2014-09-09 14:51:29 +02:00
photos.php	New: Form to add a photo is immediatly available on photo page if	2014-07-04 15:06:45 +02:00
popuprop.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
price.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-09-07 13:18:56 +02:00
reassort.php	Fix: bad translation key	2014-09-15 20:23:04 +02:00
traduction.php	Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop	2014-06-26 21:38:03 +02:00