Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorMarcel Werk <burntime@woltlab.com>
Mon, 16 Oct 2017 16:33:35 +0000 (18:33 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 16 Oct 2017 16:33:35 +0000 (18:33 +0200)
commitb3fd769dea0714790d1f68e67238ce3d7787140b
treec44ce12e4d3cefa0f0b08cdcceab684a872a83ce
parentc58720e4342617da5e361368b5f1925447ccac89
parent6d3353946033752e7fce22e765097173eaf312b1
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:
# files/lib/data/conversation/ConversationParticipantList.class.php
files/lib/data/conversation/ConversationParticipantList.class.php