Joel Bout 2ca812159d Merge branch 'develop' into feature/complex-mapping ... Conflicts: model/LdapAdapter.php		2015-12-18 15:10:54 +01:00
..
LdapAdapter.php	Merge branch 'develop' into feature/complex-mapping	2015-12-18 15:10:54 +01:00
LdapUser.php	Added complex rules to map the user attributes	2015-03-13 18:39:02 +01:00
LdapUserFactory.php	Added complex rules to map the user attributes	2015-03-13 18:39:02 +01:00