dolibarr/htdocs/theme
Laurent Destailleur 33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +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-05 01:15:19 +02:00
md Merge remote-tracking branch 'origin/4.0' into develop 2016-08-05 01:15:19 +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