Merge branch 'develop' into issues/509

# Conflicts:
#	public/js/ff/transactions/list.js

routes/api.php

@@ -32,6 +32,8 @@ use Illuminate\Http\Request;
 |
 */
 
-Route::middleware('auth:api')->get('/user', function (Request $request) {
+Route::middleware('auth:api')->get(
+    '/user', function (Request $request) {
     return $request->user();
-});
+}
+);

routes/breadcrumbs.php

@@ -22,7 +22,6 @@ declare(strict_types=1);
 
 use Carbon\Carbon;
 use DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator;
-//use DaveJamesMiller\Breadcrumbs\Generator as BreadCrumbsGenerator;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Attachment;
@@ -43,6 +42,8 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 
+//use DaveJamesMiller\Breadcrumbs\Generator as BreadCrumbsGenerator;
+
 // HOME
 Breadcrumbs::register(
     'home',
@@ -599,7 +600,6 @@ Breadcrumbs::register(
 );
 
 
-
 // PREFERENCES
 Breadcrumbs::register(
     'preferences.index',

routes/channels.php

@@ -30,6 +30,8 @@
 |
 */
 
-Broadcast::channel('App.User.{id}', function ($user, $id) {
-    return (int) $user->id === (int) $id;
-});
+Broadcast::channel(
+    'App.User.{id}', function ($user, $id) {
+    return (int)$user->id === (int)$id;
+}
+);

routes/console.php

@@ -32,6 +32,8 @@ use Illuminate\Foundation\Inspiring;
 |
 */
 
-Artisan::command('inspire', function () {
+Artisan::command(
+    'inspire', function () {
     $this->comment(Inspiring::quote());
-})->describe('Display an inspiring quote');
+}
+)->describe('Display an inspiring quote');