Merge branch 'next' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Mon, 28 Sep 2015 11:49:11 +0000 (13:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 28 Sep 2015 11:49:11 +0000 (13:49 +0200)
commita5c254f56e4d0e0ec4866d5e651166a3dffe14d6
treec4c7c276e704efeb7632bdaf3512b52a8fff440c
parentf1ee472971401d2fdbc638926cf8137a03e0f4ef
parentc91fd2e6b63c5ea4c4c45e26a7ef1bca021e4833
Merge branch 'next' into next-lantia

Conflicts:
com.woltlab.wcf/templates/messageSidebar.tpl
com.woltlab.wcf/templates/userSidebar.tpl
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.js