James Cole 93d481b515 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		2021-03-28 11:56:01 +02:00
..
V1	Merge branch 'release/5.5.0' into main	2021-03-28 11:56:01 +02:00