Laurent Destailleur 94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang

2015-09-12 15:23:02 +02:00

..

bankjournal.php

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

2015-09-12 15:23:02 +02:00

index.html

…

index.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

purchasesjournal.php

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

2015-09-12 15:23:02 +02:00

sellsjournal.php

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

2015-09-12 15:23:02 +02:00