Merge remote-tracking branch 'security/advisory-fix-1' into develop

Browse Source

# Conflicts:
#	admin.php

...

This commit is contained in:

Matias Griese

2021-04-06 19:47:34 +03:00

parent af4b0977de 58e2c6cc55

commit 4e18aef93f

22 changed files with 1935 additions and 661 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

637

admin.php

File diff suppressed because it is too large Load Diff