dolibarr/htdocs/theme/eldy
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
..
ckeditor Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
img Merge remote-tracking branch 'origin/3.7' into develop 2015-02-15 19:51:49 +01:00
tpl Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
.gitignore Prepare freeze 2014-11-07 21:52:50 +01:00
AUTHOR
graph-color.php Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-15 02:28:16 +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
style.css.php Merge remote-tracking branch 'origin/3.7' into develop 2015-01-30 15:53:06 +01:00
thumb.png Optimized theme images 2014-08-19 12:39:25 +02:00