Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia

author Alexander Ebert <ebert@woltlab.com>

Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)

committer Alexander Ebert <ebert@woltlab.com>

Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
author Alexander Ebert <ebert@woltlab.com>
Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
committer Alexander Ebert <ebert@woltlab.com>
Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
diff --cc wcfsetup/install/files/js/WCF.ImageViewer.js
Simple merge
diff --cc wcfsetup/install/files/js/WCF.Message.js
Simple merge
diff --cc wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js
Simple merge
diff --cc wcfsetup/install/files/lib/data/TMultiCategoryObject.class.php
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
author	Alexander Ebert <ebert@woltlab.com>
	Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
committer	Alexander Ebert <ebert@woltlab.com>
	Fri, 4 Mar 2016 12:28:31 +0000 (13:28 +0100)
		1	2
wcfsetup/install/files/js/WCF.ImageViewer.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WCF.Message.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/TMultiCategoryObject.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	patch \|	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	patch \|	diff1 \|	diff2 \|	blob \| history