Merge branch 'stable'

# Conflicts:
#	package-lock.json
#	package.json
parents 98e659c7 ecb2d1a2
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