snipe bcd988bb81 Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop ...

# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php

2018-07-17 01:11:15 -07:00

..

Controllers

Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop

2018-07-17 01:11:15 -07:00

Middleware

…

Requests

Fixes #5859 - add file name/size to file upload UI (#5861)

2018-07-16 20:09:53 -07:00

Traits

Fix tests

2018-07-09 21:57:45 -07:00

Transformers

Fixing #5773: Refactoring the "clearing" of select2 lists (#5839)

2018-07-16 14:10:54 -07:00

Kernel.php

…