snipe 12ae408830 Merge remote-tracking branch 'origin/develop' ...

# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	resources/views/auth/passwords/reset.blade.php

2020-10-19 16:40:07 -07:00

..

Controllers

Merge remote-tracking branch 'origin/develop'

2020-10-19 16:40:07 -07:00

Middleware

Squashed commit of the following:

2020-08-31 12:17:19 -07:00

Requests

Added fieldname to file name for better clarity on setting logos

2020-08-26 12:17:36 -07:00

Traits

Added: Caching of settings (#6378)

2018-11-01 19:59:50 -07:00

Transformers

Added boolean has_eula to categories

2020-09-11 16:05:42 -07:00

Kernel.php

Squashed commit of the following:

2020-08-31 12:17:19 -07:00