Merge branch '3.1' into 5.2
authorMarcel Werk <burntime@woltlab.com>
Mon, 30 Mar 2020 11:00:50 +0000 (13:00 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 30 Mar 2020 11:00:50 +0000 (13:00 +0200)
commit84c122cdd2340ff4fce027af87d9e8697190f0a7
treee240bc41b9b8a8b1a6abc072b7d56639d1e857eb
parent53da98266da051db7841f52b86097b0854b0c49d
parentf9f41c5d948d7d53ab9d5fb02d89d6778710f653
Merge branch '3.1' into 5.2
files/lib/system/importer/ConversationMessageImporter.class.php