dolibarr/htdocs/theme
Laurent Destailleur e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
2015-02-15 19:51:49 +01:00
..
amarok Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
auguria Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
bureau2crea Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
cameleo Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
common
eldy Merge remote-tracking branch 'origin/3.7' into develop 2015-02-15 19:51:49 +01:00
.gitignore
dolibarr_logo.png
dolibarr_preferred_partner_int.png
dolibarr.png
doliforge_logo.png
dolistore_logo.png
index.html
login_background.png
login_logo.png