frederic34 b850b7b448 Merge remote branch 'upstream/develop' into tooltip ... Conflicts: htdocs/langs/en_US/sendings.lang		2015-01-30 16:45:24 +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
user.class.php	Merge remote branch 'upstream/develop' into tooltip	2015-01-30 16:45:24 +01:00
usergroup.class.php	Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into	2015-01-17 15:11:12 +01:00