snipe-it/routes
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
..
web Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
api.php Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
console.php Discussion: Moving to policies for controller based authorization (#3080) 2016-12-19 11:04:28 -08:00
web.php app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php 2019-02-19 22:19:00 +03:00