James Cole 6b6107fb00 Merge branch 'develop' into 5.8-dev ... # Conflicts: # config/firefly.php # frontend/src/i18n/nb_NO/index.js # frontend/src/i18n/nl_NL/index.js # frontend/src/i18n/ru_RU/index.js		2022-07-17 08:18:18 +02:00
..
Api	Add strict types, add debug info	2022-07-16 09:25:10 +02:00
Controllers	Fix #6168	2022-07-16 16:59:17 +02:00