Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Mon, 28 Sep 2015 11:47:50 +0000 (13:47 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 28 Sep 2015 11:47:50 +0000 (13:47 +0200)
commitc91fd2e6b63c5ea4c4c45e26a7ef1bca021e4833
tree3ff265ac7b995894046b4af0e145d01572f00c84
parent8ea8ddf95067c743b46a10068c623ba7e891ed59
parentef3e9baba68ed33ec9a344b88a520f51fc938e08
Merge branch 'master' into next

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
wcfsetup/install/files/js/WCF.Combined.min.js
wcfsetup/install/files/lib/system/WCF.class.php
12 files changed:
com.woltlab.wcf/templates/messageSidebar.tpl
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/lib/data/style/StyleAction.class.php
wcfsetup/install/files/lib/data/style/StyleEditor.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/option/OptionHandler.class.php
wcfsetup/install/files/style/icon.less
wcfsetup/install/files/style/layout.less
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml