Commit eaddb4f0 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.2.x'

parents bbe6f232 b719b027
Markdown is supported
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