James Cole 0022009dd5 Merge branch 'develop' into 5.8-dev ...

# Conflicts:
#	config/firefly.php
#	resources/lang/de_DE/firefly.php
#	resources/lang/de_DE/validation.php
#	resources/lang/pl_PL/firefly.php

2022-12-29 19:16:24 +01:00

..

js

Merge branch 'develop' into 5.8-dev

2022-12-29 19:16:24 +01:00

sass

Update email address

2020-01-25 06:08:56 +01:00