dolibarr/htdocs/theme/eldy
Laurent Destailleur ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
2014-05-29 19:20:48 +02:00
..
ckeditor New: Update ckeditor to version 4 (part 2) 2014-03-08 13:17:20 +01:00
img Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
tpl Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
AUTHOR
graph-color.php Removed closing php tag 2014-05-03 18:18:44 +02:00
index.php Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
style.css.php Merge remote-tracking branch 'origin/3.5' into develop 2014-05-29 19:20:48 +02:00
thumb.png Fix: thumb image was not up to date compared to new skin. 2014-01-14 22:18:44 +01:00