Skip to content
Commit 9be955c4 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'stable-3.1' into 'http2-always' 

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql
parents f31b004c 60f83685
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