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

5.6 KiB

Executable File

Raw Blame History

View Raw