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

develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php

2019-03-02 18:30:17 +01:00

..

accountancycategory.class.php

wip

2019-02-25 00:56:48 +01:00

accountancyexport.class.php

wip

2019-02-25 00:56:48 +01:00

accountancysystem.class.php

wip

2019-02-25 00:56:48 +01:00

accountingaccount.class.php

wip

2019-02-25 00:56:48 +01:00

accountingjournal.class.php

wip

2019-02-25 00:56:48 +01:00

bookkeeping.class.php

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

2019-03-02 18:30:17 +01: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

lettering.class.php

Merge branch 'develop' into nospaceaftercomma

2019-02-03 19:27:16 +01:00