fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios ... Conflicts: pandora_console/include/class/Tree.class.php		2018-04-10 09:29:14 +02:00
..
configure_profile.php	add lost lines of fixed old problem. Ticket: #3912	2016-09-22 09:10:53 +02:00
configure_user.php	[Secondary groups] Modified configure user to manage secondary groups	2018-03-20 16:51:41 +01:00
profile_list.php	Fixed json in audit log	2018-04-05 16:57:26 +02:00
user_list.php	fixed errors acl	2018-01-30 17:44:51 +01:00