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

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php

2017-05-05 14:49:25 +02:00

..

zip

Normalized EOL

2013-07-01 12:00:42 +02:00

odf.php

Fix doxygen

2017-04-29 01:01:12 +02:00

Segment.php

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

2017-05-05 14:49:25 +02:00

SegmentIterator.php

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

2016-06-22 20:22:22 +02:00