Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Wed, 1 Jun 2016 15:38:01 +0000 (17:38 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 1 Jun 2016 15:38:01 +0000 (17:38 +0200)
commit93395679b886f9e4d6df66f2fe125742bc1c9d53
tree6f2afe33b7d1254b665212bc690faeb8adb61fe0
parent390ec50570caedd9f82a8e21022440b95da23780
parentafccebe3cb187a22c50e2d1bef283dfe9443a1eb
Merge branch 'master' into next

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php
# wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
#
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
wcfsetup/install/files/lib/acp/page/TemplateListPage.class.php
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
wcfsetup/install/files/lib/system/upload/DefaultUploadFileSaveStrategy.class.php