James Cole f4af19e121 Merge branch 'develop' into 5.8-dev ...

# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/pt-br.json
#	resources/lang/pt_BR/firefly.php
#	yarn.lock

2022-10-23 14:49:54 +02:00

..

CronController.php

Various code cleanup.

2021-09-18 10:20:19 +02:00

HealthcheckController.php

Small refactor in #5153

2021-10-02 14:23:34 +02:00

InstallController.php

Merge branch 'develop' into 5.8-dev

2022-10-23 14:49:54 +02:00