Laurent Destailleur 293c8e145a Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang

2016-06-05 02:20:27 +02:00

..

ajaxdirpreview.php

FIX #5108

2016-06-05 00:24:00 +02:00

ajaxdirtree.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

bankconciliate.php

Typo

2015-07-15 19:13:23 +02:00

box.php

Fix: disable hook for avoid errors when object langs is disable

2015-08-22 09:24:46 +02:00

constantonoff.php

Fix: for avoid error with main context hooks, with $langs object for

2015-07-03 22:14:34 +02:00

contacts.php

FIX bad translation language loaded

2016-04-03 20:02:02 +02:00

extraparams.php

Removed closing php tag

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

fileupload.php

Removed closing php tag

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

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

loadinplace.php

Fix: add possibility to use element id

2014-09-26 09:20:02 +02:00

objectonoff.php

Update objectonoff.php

2014-10-18 22:47:12 +02:00

price.php

Removed closing php tag

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

row.php

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

2015-12-18 22:12:03 +01:00

saveinplace.php

Removed closing php tag

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

security.php

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

2015-08-26 11:26:00 +02:00

selectsearchbox.php

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

2016-04-07 20:01:52 +02:00

vatrates.php

Removed closing php tag

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

ziptown.php

Fix: sql request not compatible with pgsql

2014-08-30 20:04:53 +02:00