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

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php

2019-10-20 15:30:28 +02:00

..

class

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00

card.php

Move Gnu.org to https

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

clients.php

Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen

2019-10-16 20:00:01 +02:00

document.php

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

2019-10-20 15:30:28 +02:00

index.php

Look and feel v11. Picto are fontawesome.

2019-10-02 18:14:41 +02:00

info.php

Move Gnu.org to https

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

list.php

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00

quadri_detail.php

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00