snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop ... # Conflicts: # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/LicensesController.php # composer.json # composer.lock # config/version.php # resources/views/auth/two_factor_enroll.blade.php		2019-05-06 08:45:13 -04:00
..
asset-requested.blade.php
checkin-accessory.blade.php
checkin-asset.blade.php
checkin-license.blade.php
checkout-accessory.blade.php
checkout-asset.blade.php
checkout-consumable.blade.php
checkout-license.blade.php
report-expected-checkins.blade.php
report-expiring-assets.blade.php
report-expiring-licenses.blade.php
report-low-inventory.blade.php
upcoming-audits.blade.php
user-inventory.blade.php