Laurent Destailleur 04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php

2018-02-27 19:18:43 +01:00

..

admin

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-02-27 19:18:43 +01:00

frames.php

NEW Externalsite module can accept iframe content.

2018-02-08 19:00:13 +01:00

frametop.php

Standardize code

2017-05-13 17:04:46 +02: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