Skip to content
Commit 1b440aba authored by Joel Kuder's avatar Joel Kuder
Browse files

Merge branch 'develop' into 'add_noquota' 

# Conflicts:
#   server/lib/classes/cron.d/100-monitor_hd_quota.inc.php
parents c26a9f69 35d97907
Pipeline #13095 failed with stage
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