Skip to content
Commit e960b265 authored by Olivier Goffart's avatar Olivier Goffart
Browse files

Merge remote-tracking branch '2.1' into 2.2

parents 1d93af5f f6b35e5d
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