Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 13 Apr 2016 18:08:41 +0000 (20:08 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 13 Apr 2016 18:08:41 +0000 (20:08 +0200)
commit93f6cd681cb2f507fca7cb105369b66bca846786
tree3e6d996315df2bf46f3d4aa4ce2049eb582a6e53
parentde7c519ae73adf7d05bf0c3f4531ee0b674bdce6
parent65af011c8ee6abd5cf131c861e9223495d44c5a0
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# com.woltlab.wcf/templates/wysiwyg.tpl
# 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/style/redactor.less
# wcfsetup/install/lang/en.xml
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml