Laurent Destailleur 65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/class/commondocgenerator.class.php		2018-10-24 03:39:33 +02:00
..
common	Add a component to select lang into a web site	2018-10-03 18:40:54 +02:00
eldy	missing simicolon	2018-10-21 07:41:40 +03:00
md	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-24 03:35:44 +02:00
.gitignore
dolibarr_logo.png	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
dolibarr_preferred_partner_int.png
dolibarr.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
dolistore_logo.png	Fix #3930 Removed executable bit	2015-12-09 13:28:36 +01:00
index.html
login_logo.png