# Conflicts:
#   CHANGELOG.md
#   RELEASE.md
#   edit/index.html
#   edit/js/dariah.workflow.conf.js
#   edit/list.html
#   embed/index.html
#   index.html