Merge branch 'next' into next-lantia
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 9 Feb 2016 19:16:38 +0000 (20:16 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 9 Feb 2016 19:16:38 +0000 (20:16 +0100)
commit9480fe650ddbe7b927911241e3b720ce8c7b75cf
treef4f368ffbcdc2b2983f18012340b439fd2c27359
parent41ec911ac8889c7d2cb4d13fde00920aae5a5fd9
parent2f1faf7c60c76ec0fac8e5301dd1860825c54254
Merge branch 'next' into next-lantia
com.woltlab.wcf/option.xml
wcfsetup/install/files/acp/templates/userOptionAdd.tpl
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
wcfsetup/install/files/lib/data/user/UserAction.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml