Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Sun, 15 Apr 2018 18:44:11 +0000 (20:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 15 Apr 2018 18:44:11 +0000 (20:44 +0200)
commit8fa09c2384b72930d7e6a1785c2b525b1fa54352
treec9f62d0ae1168b993600f4d87cb8a18ac5db34d1
parentdebb96416970d2df80a5ceb34807b282c4d8df25
parent87ad5049199babede996cdc78aa36d70655ebb13
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:
# com.woltlab.wcf/option.xml
# wcfsetup/install/files/lib/system/bbcode/ImageBBCode.class.php
# wcfsetup/install/lang/de.xml
# wcfsetup/install/lang/en.xml
com.woltlab.wcf/option.xml
constants.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml