Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 24 Oct 2015 13:10:58 +0000 (15:10 +0200)
commitc5c11695d71525365a5b231fed9584e973c36d80
tree00ed5ebc9072ed45407f3cc36a261aa49c315ffd
parent5958bb4d77fb13660ea26ffe345672c4472e0214
parentc2275f5014d928dec2506316decf977e62f196f6
Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
wcfsetup/install/files/acp/templates/languageExport.tpl
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js
wcfsetup/install/lang/de.xml