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
..
doc	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-07 03:28:36 +01:00
index.html
mod_arctic.php
mod_pacific.php
modules_fichinter.php	Removed all triggers _BUILDOC. Building a document is not a business	2014-08-22 00:01:53 +02:00