Laurent Destailleur 06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php		2019-06-25 13:03:54 +02:00
..
common	Upgrade font awesome to 5.7.2	2019-03-12 09:13:16 +01:00
eldy	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-25 13:03:54 +02:00
md	Fix css	2019-06-25 11:35:40 +02:00
.gitignore	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-09-22 16:28:34 +02:00
dolibarr_logo.png	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
dolibarr_preferred_partner_int.png	Fix: Typo and translation	2014-12-17 01:56:36 +01:00
dolibarr.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
dolistore_logo.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
index.html
login_logo.png