dolibarr/htdocs/websites/class
Florian HENRY fda5e6002f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/websites/index.php
2016-05-02 20:27:34 +02:00
..
website.class.php Can set the home page of web sites 2016-05-02 15:51:18 +02:00
websitepage.class.php Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2016-05-02 20:27:34 +02:00