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

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php

2019-01-30 16:54:38 +01:00

..

admin

Merge branch 'develop' into toomanylines

2019-01-27 17:59:13 +01:00

ajax

PSR2.Files.EndFileNewline.TooMany

2019-01-27 14:10:35 +01:00

canvas

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00

class

Move my email to the new one

2019-01-28 21:39:22 +01:00

composition

PSR2 usage of else if is discouraged

2019-01-27 10:49:34 +01:00

dynamic_price

Merge branch 'develop' into elseif

2019-01-27 17:54:06 +01:00

inventory

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

2019-01-27 18:27:58 +01:00

stats

PSR2 usage of else if is discouraged

2019-01-27 10:49:34 +01:00

stock

Merge branch 'develop' into toomanylines

2019-01-27 17:59:13 +01:00

agenda.php

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

2018-12-16 13:39:16 +01:00

card.php

NEW: When you create product or service, sell accountancy account by default are proposed

2019-01-28 22:27:55 +01:00

document.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

fournisseurs.php

Move my email to the new one

2019-01-28 21:39:22 +01:00

index.php

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

2019-01-30 16:54:38 +01:00

list.php

PSR2 usage of else if is discouraged

2019-01-27 10:49:34 +01:00

note.php

PSR2.Files.EndFileNewline.TooMany

2019-01-27 14:10:35 +01:00

popuprop.php

PSR2 usage of else if is discouraged

2019-01-27 10:49:34 +01:00

price.php

Move my email to the new one

2019-01-28 21:39:22 +01:00

reassort.php

Merge branch 'develop' into PR_NEW_reception

2018-12-15 12:50:31 +01:00

reassortlot.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

traduction.php

PSR2 usage of else if is discouraged

2019-01-27 10:49:34 +01:00