snipe e1c6d4ced7 Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Requests/SettingsSamlRequest.php		2021-04-14 15:15:07 -07:00
..
LdapAd.php	Added sanity check to determine if a bind user account is set. (#9340)	2021-03-24 14:08:37 -07:00
LdapAdConfiguration.php	Modify Snipe-IT v5 AD handling to use the same ldap_host, and improve OU handling	2020-10-06 18:31:06 -07:00
PredefinedKitCheckoutService.php	Feedback for Kits; Fix checkins for accessories (#7060)	2019-05-23 19:39:30 -07:00
Saml.php	Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop	2021-04-14 15:15:07 -07:00