Laurent Destailleur 171227e43a Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/class/html.formfile.class.php		2014-06-06 12:00:21 +02:00
..
user.class.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-06-06 12:00:21 +02:00
usergroup.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00