Laurent Destailleur eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/categories.php htdocs/admin/dict.php htdocs/langs/de_DE/bills.lang htdocs/langs/en_US/main.lang htdocs/langs/fr_FR/bills.lang		2017-02-21 10:34:52 +01:00
..
common	Add octicons	2017-02-09 14:42:15 +01:00
eldy	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-21 10:34:52 +01:00
md	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-21 10:34:52 +01:00
.gitignore	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-09-22 16:28:34 +02:00
dolibarr_logo.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
dolibarr_preferred_partner_int.png
dolibarr.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
doliforge_logo.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_background.png
login_logo.png