James Cole 49560ca6a6 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

2022-10-16 19:13:15 +02:00

..

css

Code cleanup.

2021-03-28 11:43:07 +02:00

fonts

Clean up and optimize fonts.

2020-03-10 19:51:26 +01:00

images

…

js

Merge branch 'develop' into 5.8-dev

2022-10-16 19:13:15 +02:00

lib

…