Commit 8db39140 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.2.x'

parents ac944f02 2b38a861
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