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
..
factories	Fixed mac address regex	2018-09-29 22:41:17 -07:00
migrations	Make action_date a datetime	2019-03-13 21:53:56 -07:00
seeds	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
.gitignore	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00