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
..
class	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2016-05-02 20:27:34 +02:00
frametop.php	Work on website module	2016-02-02 16:24:12 +01:00
index.html
index.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2016-05-02 20:27:34 +02:00