Merge branch 'release/5.5.0' into main

# Conflicts:
#	config/firefly.php
#	frontend/src/scss/_variables.scss
#	frontend/yarn.lock
#	public/v2/css/app.css
#	public/v2/css/app.css.map
#	public/v2/js/transactions/edit.js
#	public/v2/js/transactions/edit.js.map
#	public/v2/js/vendor.js
#	public/v2/js/vendor.js.map

config/auth.php

@@ -122,8 +122,6 @@ return [
             'expire'   => 60,
         ],
     ],
-
-
     /*
     |--------------------------------------------------------------------------
     | Password Confirmation Timeout

config/cache.php

@@ -93,8 +93,6 @@ return [
             'driver'     => 'redis',
             'connection' => 'default',
         ],
-
-
         'dynamodb' => [
             'driver' => 'dynamodb',
             'key' => env('AWS_ACCESS_KEY_ID'),
@@ -117,6 +115,4 @@ return [
     */
 
     'prefix' => env('CACHE_PREFIX', 'firefly'),
-
-
 ];

config/debugbar.php

@@ -1,6 +1,4 @@
 <?php
-
-
 /**
  * debugbar.php
  * Copyright (c) 2020 james@firefly-iii.org

config/mail.php

@@ -74,9 +74,6 @@ return [
     ],
 
     'from' => ['address' => envNonEmpty('MAIL_FROM', 'changeme@example.com'), 'name' => 'Firefly III Mailer'],
-
-
-
     'markdown' => [
         'theme' => 'default',
 

config/twigbridge.php

@@ -1,6 +1,4 @@
 <?php
-
-
 /*
  * twigbridge.php
  * Copyright (c) 2021 james@firefly-iii.org