Merge remote-tracking branch 'origin/feature/5655-edit-object-in-modal' into develop

Browse Source

# Conflicts:
#	pages/ajax.render.php

...

This commit is contained in:

Molkobain

2022-11-23 15:57:55 +01:00

parent 6af62c4a50 a553616ea2

commit a0a5037554

28 changed files with 4428 additions and 3860 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

4382

pages/ajax.render.php

File diff suppressed because it is too large Load Diff