Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 25 Apr 2017 19:59:45 +0000 (21:59 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 25 Apr 2017 19:59:45 +0000 (21:59 +0200)
commit4e60ab53ba35a5426b5d73c8bafcd4353619fe82
tree86989c0985c3aeb8a2a02b0ecab32ba564b9951f
parent255e04f51490195198c7afd40eba702b78c73d3c
parentfae2a6c2286c4df53af525cb104e1e69d60d9cac
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# com.woltlab.wcf/objectType.xml
com.woltlab.wcf/objectType.xml
com.woltlab.wcf/templates/articleList.tpl
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/acp/templates/pageAdd.tpl
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php