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

Conflicts:
	htdocs/takepos/admin/receipt.php

2020-06-21 20:48:41 +02:00

..

actioncomm.class.php

prepare new rule

2020-05-23 21:07:47 +02:00

actioncommreminder.class.php

add new rule

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

api_agendaevents.class.php

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

2020-06-21 20:48:41 +02:00

cactioncomm.class.php

add new rule

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

ical.class.php

add new rule

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

index.html

…