Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 8 Jan 2017 18:26:14 +0000 (19:26 +0100)
commit1145bd7aa0c4dc57ad859dce3641c01ec390ba5e
tree8526e245a4cb339800d62eec90651ba480337a65
parente439e96be487f928a800c5ab3759ecc58833b4cd
parentabb92d5aeee0748c7c44df56fcbc5dce51b02ad5
Merge branch 'master' of github.com:WoltLab/WCF
wcfsetup/install/files/lib/system/email/Email.class.php
wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml