James Cole 65c49c7a71 Merge branch 'develop' into feature/credit_calc ...

# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue

2021-04-27 06:54:38 +02:00

..

api.php

Add newlines and remove some unused translations.

2020-05-30 07:33:06 +02:00

auth.php

Update email address

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

breadcrumbs.php

Rebuild frontend.

2020-10-01 14:24:35 +02:00

components.php

Add newlines and remove some unused translations.

2020-05-30 07:33:06 +02:00

config.php

Regenerate frontend.

2021-04-18 12:29:42 +02:00

demo.php

Remove import code.

2020-06-06 21:23:26 +02:00

email.php

Fix #3940

2020-10-24 15:52:51 +02:00

errors.php

Reformat translations.

2020-05-29 06:43:42 +02:00

firefly.php

Merge branch 'develop' into feature/credit_calc

2021-04-27 06:54:38 +02:00

form.php

Update transactions.

2021-04-08 10:23:35 +02:00

intro.php

Fix some translations.

2020-08-02 09:47:19 +02:00

list.php

Code for #3240

2020-07-26 07:57:48 +02:00

locales.json

New strings.

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

pagination.php

Update email address

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

passwords.php

Update email address

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

validation.php

Some new strings.

2021-04-10 17:25:00 +02:00