Merge branch 'next' into email-use
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 29 Jul 2016 14:30:55 +0000 (16:30 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 29 Jul 2016 14:30:55 +0000 (16:30 +0200)
commit30648ed961a47b91cab5ca8f3f83341b9d8c7cbb
tree62a4b8f73cec699741cf00205a88d068aefef245
parent38cbb45721672acd6878d830409bd326aeb230f7
parentd50f1d6b04c2eb1b6980ccedf1235d4f99742ec5
Merge branch 'next' into email-use
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/email/Email.class.php
wcfsetup/install/files/lib/system/email/mime/AbstractMultipartMimePart.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml