Commit 4184cc94 authored by HgO's avatar HgO
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   manifest.json
#   scripts/upgrade
parents 24e385bb c716578c
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