Commit ce06e864 authored by David Morley's avatar David Morley

Merge branch 'master' into 'develop'

# Conflicts:
#   Changelog.md
#   README.md
#   index.php
#   package.json
parents 81228a3b 7ec0798b
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