Laurent Destailleur 9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php

2014-05-06 23:58:17 +02:00

..

admin

Removed closing php tag

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

class

Merge remote-tracking branch 'origin/3.5' into develop

2014-05-06 23:58:17 +02:00

categorie.php

Removed closing php tag

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

edit.php

Removed closing php tag

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

fiche.php

Removed closing php tag

2014-05-03 18:18:44 +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

Removed closing php tag

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

viewcat.php

Category extrafields on categories: edit and view

2014-03-16 16:04:18 +01:00