Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Wed, 6 May 2020 18:26:33 +0000 (20:26 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 6 May 2020 18:26:33 +0000 (20:26 +0200)
commit2845fedda1d57a284d95e23aaa92cba669f3bf99
treeab365528c999c09036d2ca4dabd01bba7533a436
parentc0132f4c34f3c14bb37432970d8043483bc65552
parentfc8e24c00932145e4d169cb6f52bfe56d3e55308
Merge branch '3.1' into 5.2
files/lib/system/search/ConversationMessageSearch.class.php