dolibarr/htdocs/cron
Laurent Destailleur 9768550696 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
..
admin Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
class Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
card.php Merge remote-tracking branch 'origin/3.6' into develop 2014-10-12 02:54:34 +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
info.php Qual: Doxygen 2013-08-22 16:49:23 +02:00
list.php Merge remote-tracking branch 'origin/3.6' into develop 2014-10-12 02:54:34 +02:00