Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 7 Jun 2017 10:26:23 +0000 (12:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 7 Jun 2017 10:26:23 +0000 (12:26 +0200)
commit8a49ec537b9ac8266f0edb7ff5ff209ded0026ff
treeaaf7ecaa1f620f267bc00c2935fd59f65dd3e65e
parentc22fdb8639f4c5d52ae0b26942d8c414b24d0678
parent45f4ee96cd00263fb8a452b4851757b26ca0195e
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# wcfsetup/install/files/js/WCF.Combined.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
# wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
# wcfsetup/install/files/lib/system/api/composer.lock
# wcfsetup/install/files/lib/system/api/erusev/parsedown/README.md
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Poll.js
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Code.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Quote.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Spoiler.js
wcfsetup/install/files/lib/system/api/composer/installed.json