Merge branch 'master' into notifications
authorAlexander Ebert <ebert@woltlab.com>
Wed, 25 Jun 2014 18:19:11 +0000 (20:19 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 25 Jun 2014 18:19:11 +0000 (20:19 +0200)
commitacbf358a2acfdd6e1a40d98919a060073f5b119e
treea84397f9e7108ecfd21057cdf1b73b5be61200e3
parente6c64faff69a4443beb9fdc3999d48de900233a6
parent14293a76492945db34af2f9112fd911575954e61
Merge branch 'master' into notifications
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql