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

..

assets

Audit dark mode theme skins and check for [ch15847] (#9102)

2021-02-25 19:41:31 -08:00

lang

Feature/ch16172/adding other fields to ldap sync settings (#9416)

2021-04-14 10:17:57 -07:00

macros

Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891)

2021-03-29 19:09:23 -07:00

views

Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop

2021-04-14 15:15:07 -07:00