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

Optimized theme images

2014-08-19 12:39:25 +02:00

eldy

Merge remote-tracking branch 'origin/3.7' into develop

2015-02-15 19:51:49 +01:00

.gitignore

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2014-12-22 01:43:20 +01:00

dolibarr_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00

dolibarr_preferred_partner_int.png

Fix: Typo and translation

2014-12-17 01:56:36 +01:00

dolibarr.png

Optimized theme images

2014-08-19 12:39:25 +02:00

doliforge_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00

dolistore_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

login_background.png

Optimized theme images

2014-08-19 12:39:25 +02:00

login_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00