Merge remote-tracking branch 'origin/1.4.x' into add-error-attribute

Browse Source

# Conflicts:
#	CHANGES.md
#	app/workers/databases.php
#	composer.json
#	composer.lock

...

This commit is contained in:

Jake Barnby

2023-06-15 12:26:29 +12:00

parent 13ea6a5e69 a9e2eca8a4

commit 1604b339dd

8051 changed files with 154505 additions and 57669 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

app/controllers/api/databases.php

+1390 -241

File diff suppressed because it is too large Load Diff