James Cole e8a6f30e4e Merge branch 'develop' into v6.2 ...

# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json

2024-12-18 16:39:22 +01:00

..

assets

Merge pull request #9550 from firefly-iii/dependabot/npm_and_yarn/develop/chartjs-chart-sankey-0.14.0

2024-12-16 06:59:10 +01:00

lang

Add option for manual activation.

2024-12-15 19:59:36 +01:00

locales

Fix missing locales files.

2024-06-02 07:29:41 +02:00

stubs

Various code cleanup.

2017-12-29 09:05:35 +01:00

views

Add option for manual activation.

2024-12-15 19:59:36 +01:00