Commit 48827528 authored by nanahira's avatar nanahira

Merge branch 'merge-upstream' into 'master'

Merge upstream

See merge request !76
parents 4a3d5416 4be23b44
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