snipe 288cc01c41 Merge branch 'features/accessories_users' into develop ... # Conflicts: # app/Http/Controllers/Api/UsersController.php # config/version.php # routes/api.php		2019-03-01 17:30:03 -08:00
..
Controllers	Merge branch 'features/accessories_users' into develop	2019-03-01 17:30:03 -08:00
Middleware	Added: Caching of settings (#6378)	2018-11-01 19:59:50 -07:00
Requests	Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop	2019-02-13 23:02:21 -08:00
Traits	Added: Caching of settings (#6378)	2018-11-01 19:59:50 -07:00
Transformers	Fixed bug where assets could be deleted without being checked back in [ch38]	2019-01-22 14:13:30 -08:00
Kernel.php	Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API	2019-02-12 22:15:32 -08:00