James Cole 05fe503456 Merge branch 'develop' into 5.8-dev ... # Conflicts: # frontend/src/i18n/tr_TR/index.js # public/v1/js/create_transaction.js # public/v1/js/edit_transaction.js # public/v1/js/profile.js # resources/assets/js/locales/bg.json # resources/assets/js/locales/cs.json # resources/assets/js/locales/de.json # resources/assets/js/locales/el.json # resources/assets/js/locales/en-gb.json # resources/assets/js/locales/en.json # resources/assets/js/locales/es.json # resources/assets/js/locales/fi.json # resources/assets/js/locales/fr.json # resources/assets/js/locales/hu.json # resources/assets/js/locales/it.json # resources/assets/js/locales/ja.json # resources/assets/js/locales/nb.json # resources/assets/js/locales/nl.json # resources/assets/js/locales/pl.json # resources/assets/js/locales/pt-br.json # resources/assets/js/locales/pt.json # resources/assets/js/locales/ro.json # resources/assets/js/locales/ru.json # resources/assets/js/locales/sk.json # resources/assets/js/locales/sv.json # resources/assets/js/locales/tr.json # resources/assets/js/locales/vi.json # resources/assets/js/locales/zh-cn.json # resources/assets/js/locales/zh-tw.json # resources/lang/bg_BG/firefly.php # resources/lang/fr_FR/firefly.php # resources/lang/nl_NL/firefly.php # resources/lang/ru_RU/firefly.php		2022-10-08 07:03:40 +02:00
..
js	Merge branch 'develop' into 5.8-dev	2022-10-08 07:03:40 +02:00
sass	Update email address	2020-01-25 06:08:56 +01:00