dolibarr/htdocs/contrat
Laurent Destailleur 7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
..
admin
class Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-10 18:56:28 +02:00
tpl
card.php syntax error 2015-10-08 09:40:00 +02:00
contact.php
document.php
index.php
info.php
list.php
note.php
services.php the form should be outside table to avoid errors 2015-08-15 16:03:09 +02:00