snipe acb90c7aee Horrible master -> dev merge that makes baby jesus cry :( ...

# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	resources/views/auth/two_factor_enroll.blade.php

2019-03-20 02:24:23 -07:00

..

Controllers

Horrible master -> dev merge that makes baby jesus cry :(

2019-03-20 02:24:23 -07:00

Middleware

Minor code cleanup bits and bobs (#6805)

2019-03-13 20:12:03 -07:00

Requests

Fixes/import permissions mask (#6826)

2019-03-18 11:58:08 -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