Skip to content
Commit 8e5c13bc authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'develop' into... 

Merge branch 'develop' into '6452-uncaught-typeerror-array_merge-argument-1-must-be-of-type-array-bool-given-in'

# Conflicts:
#   server/lib/classes/file.inc.php
parents e3f14f75 35d97907
Pipeline #13106 passed with stage
in 7 minutes and 44 seconds
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment