Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
commit9c969ced801aa332cf0959f1c20271b9321e430f
tree98fe2f4833299065ab041b398ffaa647c2b0ad13
parentcbbb348c769e024483431e58135122a12eeb6ce2
parenteb90babefa5910ecee018c56027484d2e7782a1c
Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
wcfsetup/install/files/js/WCF.ImageViewer.js
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js
wcfsetup/install/files/lib/data/TMultiCategoryObject.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml