dolibarr/htdocs/categories
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 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
class Merge 2014-09-07 12:22:04 +02:00
card.php Merge remote-tracking branch 'origin/3.6' into develop 2014-10-12 02:54:34 +02:00
categorie.php Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 20:57:11 +02:00
edit.php Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
index.php Removed closing php tag 2014-05-03 18:18:44 +02:00
photos.php Removed closing php tag 2014-05-03 18:18:44 +02:00
traduction.php Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
viewcat.php Fix: CRLF 2014-10-09 17:18:14 +02:00