Laurent Destailleur b267402df6 Merge remote-tracking branch 'origin/4.0' into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/main.lang htdocs/societe/rib.php		2016-08-01 15:15:32 +02:00
..
common	More neutral picto for EDM module	2016-05-22 14:39:34 +02:00
eldy	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00
md	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02: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	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
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