Merge branch '2.1' into 3.0
authorMatthias Schmidt <gravatronics@live.com>
Wed, 7 Feb 2018 18:52:26 +0000 (19:52 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 7 Feb 2018 18:52:26 +0000 (19:52 +0100)
commit73bbf1a6c9662660bf8fb6780dbe6a64de1fd1ca
treee1dd47895e996bf5ccfacb597168a1b2cf6f4958
parent570dd418c3435c79ed2b74c9c6baaee8bf2826ce
parent7bbca526ebce86508f9cc1640f194fa1f0e1b2f4
Merge branch '2.1' into 3.0

# Conflicts:
# wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
#
wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplateP
lugin.class.php
wcfsetup/install/files/lib/data/user/UserContentAction.class.php
wcfsetup/install/files/lib/system/session/SessionHandler.class.php