Merge branch 'develop' into 5.8-dev

Browse Source

# 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

...

This commit is contained in:

James Cole

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

parent e229bd8121 abdb717b37

commit f4af19e121

23 changed files with 341 additions and 225 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

public/v1/js/create_transaction.js vendored

File diff suppressed because one or more lines are too long

2

public/v1/js/edit_transaction.js vendored

File diff suppressed because one or more lines are too long

2

public/v1/js/profile.js vendored

File diff suppressed because one or more lines are too long

2

public/v1/js/webhooks/create.js vendored

File diff suppressed because one or more lines are too long

2

public/v1/js/webhooks/edit.js vendored

File diff suppressed because one or more lines are too long

2

public/v1/js/webhooks/index.js vendored

File diff suppressed because one or more lines are too long

2

public/v1/js/webhooks/show.js vendored

File diff suppressed because one or more lines are too long