Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Tue, 17 Mar 2020 15:24:23 +0000 (16:24 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 17 Mar 2020 15:24:23 +0000 (16:24 +0100)
commitde872198f53631b2f27199292c81f9355bb0c01c
treefb26b015bb379a89d719971bf192b361466d4e85
parent14d5999e9fb2a3a30452d74a66af33c42be179f3
parent978e601c6aaaa541fd3c5ced3fa35be82ed5d81e
Merge branch '3.1' into 5.2
files/lib/data/conversation/Conversation.class.php