dolibarr/htdocs/theme/bureau2crea
Laurent Destailleur 1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
..
ckeditor Fix: tags h correctly supported 2015-02-20 15:55:55 +01:00
img Merge remote-tracking branch 'origin/3.6' into 3.7 2015-04-12 12:03:59 +02: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
AUTHOR Modification auteur 2011-08-17 15:46:12 +00:00
graph-color.php Removed closing php tag 2014-05-03 18:18:44 +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 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
thumb.png Optimized theme images 2014-08-19 12:39:25 +02:00