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

Conflicts:
	htdocs/admin/tools/export.php

2019-02-06 00:51:10 +01:00

..

accountancy

Merge branch 'develop' into nospaceaftercomma

2019-01-30 16:00:11 +01:00

bank

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

clicktodial

Avoid terminal

2013-03-31 04:12:20 +02:00

company

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

contracts

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

cron

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop

2019-02-06 00:51:10 +01:00

emailings

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

invoices

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

members

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

modulebuilder

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

odt2pdf

Debug to make MAIN_ODT_AS_PDF workign with unoconv

2017-10-10 18:54:30 +02:00

product

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

user

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

withdrawals

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00