James Cole f4af19e121 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
#	resources/assets/js/locales/pt-br.json
#	resources/lang/pt_BR/firefly.php
#	yarn.lock

2022-10-23 14:49:54 +02:00

..

api.php

Updated strings.

2020-06-04 06:49:44 +02:00

auth.php

Updated and new strings.

2020-02-14 08:07:45 +01:00

breadcrumbs.php

Update translations.

2022-09-04 13:53:24 +02:00

components.php

Updated strings.

2020-06-04 06:49:44 +02:00

config.php

Updated translations.

2022-10-22 07:34:05 +02:00

demo.php

New meta files

2020-06-22 18:02:28 +02:00

email.php

Updated translations.

2022-10-22 07:34:05 +02:00

errors.php

Update translations.

2022-09-04 13:53:24 +02:00

firefly.php

Updated translations.

2022-10-22 07:34:05 +02:00

form.php

Updated translations.

2022-10-22 07:34:05 +02:00

intro.php

Update translations.

2022-03-29 16:42:26 +02:00

list.php

Updated translations.

2022-10-22 07:34:05 +02:00

locales.json

New strings.

2020-06-24 06:45:40 +02:00

pagination.php

Updated and new strings.

2020-02-14 08:07:45 +01:00

passwords.php

Updated and new strings.

2020-02-14 08:07:45 +01:00

validation.php

Updated translations.

2022-10-22 07:34:05 +02:00