Merge branch 'next' into next-lantia
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 20:41:59 +0000 (21:41 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 20:41:59 +0000 (21:41 +0100)
1  2 
wcfsetup/install/files/js/WCF.js
wcfsetup/install/lang/de.xml
wcfsetup/setup/db/install.sql

Simple merge
Simple merge
Simple merge