dolibarr/htdocs/theme/bureau2crea
Laurent Destailleur d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
..
ckeditor Removed BOM from UTF-8 files 2012-07-28 19:04:50 +02:00
img Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
tpl Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
AUTHOR Modification auteur 2011-08-17 15:46:12 +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.3' into develop 2013-01-16 15:45:17 +01:00
thumb.png *** empty log message *** 2011-08-17 16:24:06 +00:00