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
..
2013-05-03 00:15:02 +02:00
2013-01-16 15:36:08 +01:00
2013-01-16 15:45:17 +01:00
2013-01-16 15:36:08 +01:00
2013-04-25 01:13:13 +02:00
2013-04-25 01:13:13 +02:00
2013-01-16 15:36:08 +01:00
2013-04-25 01:13:13 +02:00
2013-04-20 06:43:13 +02:00
2013-04-25 01:13:13 +02:00