Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
..
2014-09-17 17:38:07 +02:00
2014-09-17 17:38:07 +02:00
2015-01-08 18:36:03 +01:00
2015-02-03 13:05:28 +01:00
2014-11-25 20:13:43 +01:00
2014-10-31 15:42:35 +01:00
2014-05-26 13:51:25 +02:00
2014-11-25 20:13:43 +01:00
2014-08-15 02:35:06 +02:00