Laurent Destailleur 6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/CMailFile.class.php

2020-08-07 11:59:55 +02:00

..

admin

add new rule

2020-05-21 15:05:19 +02:00

class

add new rule

2020-05-21 15:05:19 +02:00

bookmarks.lib.php

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

2020-05-27 23:07:18 +02:00

card.php

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

2020-08-07 11:59:55 +02:00

index.html

…

list.php

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

2020-08-07 11:59:55 +02:00