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

..

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

pdf_soleil.modules.php

Merge remote-tracking branch 'origin/3.7' into develop

2015-02-07 03:28:36 +01:00