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
..
Controllers	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
Middleware	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Requests	Fix #6763. Import Stuck Processing - Error - Can only flip STRING and INTEGER values! (#6804)	2019-03-14 12:32:40 -07:00
Traits	Added: Caching of settings (#6378)	2018-11-01 19:59:50 -07:00
Transformers	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00
Kernel.php	Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API	2019-02-12 22:15:32 -08:00