Merge commit 'd9ff0c' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 9 Feb 2016 19:13:14 +0000 (20:13 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 9 Feb 2016 19:13:14 +0000 (20:13 +0100)
commit7ee2202c6d51f07615c005ec8c765ba62eb5188b
tree2f523f67adb03426ca0150a13139935c28bc7885
parent61d87dbfb6262be79310b263a51391f3b1d24958
parentd9ff0c018822475eed85b8607a25e9ca2e40e7b6
Merge commit 'd9ff0c' into next
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml