Laurent Destailleur f3b7bc53bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php

2018-07-15 20:16:08 +02:00

..

class

Fix conflict with external ticketsup module

2018-06-04 21:49:29 +02:00

card.php

loadlangs

2018-05-26 18:41:16 +02:00

contact.php

loadlangs

2018-05-26 18:41:16 +02:00

document.php

loadlangs

2018-05-26 18:41:16 +02:00

element_resource.php

loadlangs

2018-05-26 18:41:16 +02:00

index.html

…

list.php

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

2018-07-15 20:16:08 +02:00

note.php

loadlangs

2018-05-26 18:41:16 +02:00