dolibarr/htdocs/theme/cameleo
Laurent Destailleur 480b09f192 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
..
ckeditor Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
img Merge from 3.4 2014-01-20 02:21:30 +01:00
tpl Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
graph-color.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01: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-02-26 15:49:29 +01:00
thumb.png