Florian HENRY d2e17eb321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: ChangeLog		2014-07-11 16:09:01 +02:00
..
admin	Removed closing php tag	2014-05-03 18:18:44 +02:00
class	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2014-07-11 16:09:01 +02:00
tpl	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
contact.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
document.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
fiche.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2014-07-11 16:09:01 +02:00
index.php	More substitutions	2014-06-12 11:31:53 +02:00
info.php	Qual: remove PHP closing tag (again)	2014-05-26 13:51:25 +02:00
liste.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2014-07-11 16:09:01 +02:00
note.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
services.php	More substitutions	2014-06-12 11:31:53 +02:00