Merge branch 'develop' into 5.8-dev

Browse Source

# Conflicts:
#	config/firefly.php
#	resources/lang/de_DE/firefly.php
#	resources/lang/de_DE/validation.php
#	resources/lang/pl_PL/firefly.php

...

This commit is contained in:

James Cole

2022-12-29 19:16:24 +01:00

parent e031fffe65 6249488f0f

commit 0022009dd5

12 changed files with 36 additions and 29 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