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
..
admin	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
class	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +02:00
group	Fix syntax error	2017-06-08 14:55:12 +02:00
notify	Fix syntax error	2017-06-08 14:55:12 +02:00
agenda_extsites.php	Add badge with nb of imported calendard on user tab	2017-05-06 12:43:45 +02:00
bank.php	Clean code	2017-05-19 13:39:00 +02:00
card.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-06-07 20:23:24 +02:00
clicktodial.php	Add badge with nb of imported calendard on user tab	2017-05-06 12:43:45 +02:00
document.php	Fix var not sanitized	2017-05-16 13:27:32 +02:00
hierarchy.php	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
home.php	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
index.php	Fix syntax error	2017-06-08 14:55:12 +02:00
info.php	Add badge with nb of imported calendard on user tab	2017-05-06 12:43:45 +02:00
ldap.php	Add badge with nb of imported calendard on user tab	2017-05-06 12:43:45 +02:00
logout.php	Fix: missing global declarations	2014-08-20 19:03:58 +02:00
note.php	Fix var not sanitized	2017-05-16 13:27:32 +02:00
param_ihm.php	Look and feel v6	2017-04-29 14:55:23 +02:00
passwordforgotten.php	Removed deprecated code	2017-05-29 15:09:13 +02:00
perms.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-09 12:50:56 +02:00