Merge branch 'develop' into 'Add-Parsedown-Support'

# Conflicts:
#   README.md
This commit is contained in:
Matthias Kalb 2018-10-26 16:46:01 +00:00
commit 85cbf6d307

Diff content is not available