Laurent Destailleur 1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php		2017-06-09 12:50:56 +02:00
..
common	Remove deprecated files	2017-05-25 19:38:42 +02:00
eldy	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-09 12:50:56 +02:00
md	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-09 12:50:56 +02:00
.gitignore	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-09-22 16:28:34 +02:00
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	Fix: Typo and translation	2014-12-17 01:56:36 +01:00
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	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
login_logo.png	Optimized theme images	2014-08-19 12:39:25 +02:00