Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 20:40:29 +0000 (21:40 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 20:40:29 +0000 (21:40 +0100)
commitfb4d85fff63d688069e0615177fa8959140bb87d
treefbb41cde816f32528c52c043a6bf9f9819d897c6
parent28854f57445a35894483db28e250f94b444962a0
parent27334d49f77af24cc43343be0b624d938b115ec1
Merge branch 'master' into next
wcfsetup/install/files/js/WCF.ImageViewer.js
wcfsetup/install/files/js/WCF.js
wcfsetup/install/lang/de.xml