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

..

amarok

Closes #2545 Bug: Missing object_margin.png in Amarok theme

2015-04-07 18:54:38 +02:00

auguria

Fix: tags h correctly supported

2015-02-20 15:55:55 +01:00

bureau2crea

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-04-12 12:03:59 +02:00

cameleo

Fix: tags h correctly supported

2015-02-20 15:55:55 +01:00

common

Optimized theme images

2014-08-19 12:39:25 +02:00

eldy

Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility

2015-03-13 15:20:08 +01:00

.gitignore

Prepare freeze

2014-11-07 21:52:50 +01:00

dolibarr_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00

dolibarr_preferred_partner_int.png

Fix: Typo and translation

2014-12-17 01:56:36 +01:00

dolibarr.png

Optimized theme images

2014-08-19 12:39:25 +02:00

doliforge_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00

dolistore_logo.png

Optimized theme images

2014-08-19 12:39:25 +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

login_background.png

Optimized theme images

2014-08-19 12:39:25 +02:00

login_logo.png

Optimized theme images

2014-08-19 12:39:25 +02:00