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

Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php

2019-12-14 14:53:49 +01:00

..

bank

Merge branch 'develop' into doxygen_todo

2019-12-14 13:46:40 +01:00

cashcontrol

Merge branch 'develop' into doxygen_todo

2019-12-14 13:46:40 +01:00

charges

Fix HTML5

2019-12-12 10:31:08 +01:00

deplacement

Fix HTML5

2019-12-12 10:31:08 +01:00

facture

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

2019-12-14 14:53:49 +01:00

journal

100% centpercent

2019-11-05 21:24:41 +01:00

localtax

Scrutinizer Auto-Fixes

2019-11-14 11:09:15 +00:00

paiement

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

2019-12-14 14:53:49 +01:00

payment_sc

Fix HTML5

2019-12-12 10:31:08 +01:00

prelevement

Merge branch 'develop' into doxygen_todo

2019-12-14 13:46:40 +01:00

resultat

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

2019-12-14 14:53:49 +01:00

sociales

Fix HTML5

2019-12-12 10:31:08 +01:00

stats

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

2019-12-14 14:53:49 +01:00

tva

Fix br

2019-12-10 14:04:50 +01:00

accounting-files.php

Scrutinizer Auto-Fixes

2019-11-11 23:15:34 +00:00

ajaxpayment.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

clients.php

100% centpercent

2019-11-05 21:24:41 +01:00

index.php

Fix HTML5

2019-12-12 10:31:08 +01:00

paiement_charge.php

Fix HTML5

2019-12-12 10:31:08 +01:00

paiement.php

Fix HTML5

2019-12-12 10:31:08 +01:00

recap-compta.php

Scrutinizer Auto-Fixes

2019-11-11 23:15:34 +00:00