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

..

class

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

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

export.php

Fix pb during export of agenda events

2015-03-26 11:23:21 +01:00

index.php

Removed closing php tag

2014-05-03 18:18:44 +02:00