Laurent Destailleur 9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/langs/en_US/errors.lang

2016-12-18 11:57:04 +01:00

..

ajaxdirpreview.php

…

ajaxdirtree.php

…

bankconciliate.php

…

box.php

…

constantonoff.php

…

contacts.php

…

extraparams.php

…

fileupload.php

…

index.html

…

loadinplace.php

…

objectonoff.php

…

price.php

…

row.php

…

saveinplace.php

…

security.php

…

selectsearchbox.php

…

vatrates.php

…

ziptown.php

…