Laurent Destailleur 62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang

2018-09-27 12:55:25 +02:00

..

canvas

move phpcs:ignore

2018-09-02 22:05:19 +02:00

class

Work on module socialnetworks

2018-09-26 16:55:46 +02:00

agenda.php

loadlangs

2018-05-26 20:32:23 +02:00

card.php

Work on module socialnetworks

2018-09-26 16:55:46 +02:00

document.php

comment translation

2018-08-04 14:17:51 +02:00

index.html

…

info.php

loadlangs

2018-05-26 20:32:23 +02:00

ldap.php

loadlangs

2018-05-26 20:32:23 +02:00

list.php

Fix responsive

2018-09-25 12:54:24 +02:00

note.php

loadlangs

2018-05-26 20:32:23 +02:00

perso.php

replace select_date

2018-09-09 09:36:12 +02:00

vcard.php

Merge remote-tracking branch 'origin/3.7' into develop

2015-08-13 04:03:23 +02:00