Laurent Destailleur dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 ...

Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php

2015-12-18 21:20:12 +01:00

..

admin

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

2015-12-18 21:20:12 +01:00

bookkeeping

work on accounting

2015-12-11 11:46:22 +01:00

class

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

2015-09-09 12:45:22 +02:00

customer

work on accounting

2015-12-11 11:46:22 +01:00

journal

work on accounting

2015-12-11 11:46:22 +01:00

supplier

work on accounting

2015-12-11 11:46:22 +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