Skip to content
GitLab
Commit 55fe47f1 authored by Simon Pinches's avatar Simon Pinches
Browse files

Merge pull request #3 from boegel/20160325161943_new_pr_cairo1146 

sync with develop & resolve conflict
parents 8ac5aefb f672feba
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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