Laurent Destailleur fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: ChangeLog htdocs/compta/prelevement/bons.php htdocs/compta/prelevement/fiche-stat.php htdocs/contact/class/contact.class.php htdocs/contrat/class/contrat.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modSociete.class.php htdocs/projet/fiche.php test/phpunit/FilesLibTest.php		2013-05-03 00:15:02 +02:00
..
canvas	Fix: Fix ton of regression due to field name change	2013-03-09 20:34:38 +01:00
class	Merge remote-tracking branch 'origin/3.3' into develop	2013-05-03 00:15:02 +02:00
exportimport.php	Fix: security problem with multicompany	2013-04-26 12:36:02 +02:00
fiche.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop	2013-04-26 20:54:53 +02:00
index.php	Qual: Uniformize page name	2011-08-21 13:19:26 +00:00
info.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
ldap.php	Fix: security problem with multicompany	2013-04-26 12:36:02 +02:00
list.php	Uniformize code, order of fiels in card and language files.	2013-04-28 01:12:40 +02:00
perso.php	Fix: security problem with multicompany	2013-04-26 12:36:02 +02:00
vcard.php	Fix: security problem with multicompany	2013-04-26 12:36:02 +02:00