Merge branch 'develop' into 5.8-dev

Browse Source

# Conflicts:
#	config/firefly.php

...

This commit is contained in:

James Cole

2022-09-11 08:59:34 +02:00

parent 7104433a68 e5bc074e68

commit f0416f5322

16 changed files with 181 additions and 147 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