Laurent Destailleur abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	htdocs/core/boxes/box_activity.php

2013-01-19 16:29:16 +01:00

..

user.class.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-19 16:29:16 +01:00

usergroup.class.php

Fix: Removed warnings

2013-01-19 14:32:37 +01:00