Skip to content
Commit 1e9fb8d3 authored by Thomas Weber's avatar Thomas Weber
Browse files

Merge tag 'upstream/2.6' 

Upstream version 2.6
parents 3c829487 297cb94e
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