Skip to content
Commit 3e0cb809 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.1' into 'patch-3' 

# Conflicts:
#   install/lib/installer_base.lib.php
parents c5b28475 09767f8c
Expand all 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