Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Aug 2015 16:29:13 +0000 (18:29 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Aug 2015 16:29:13 +0000 (18:29 +0200)
commit1c495c2ff225a6d8170bef35958252a3e33ae381
treea4198a4d63e9c2dcef332a1078538874b3640a70
parentd5a09a61a33432733638aa626e3760f88876f848
parentec14dd185a50243de10cf914b41c913177d4b223
Merge branch '2.0'
files/lib/data/conversation/message/ViewableConversationMessage.class.php
files/lib/system/moderation/queue/report/ConversationMessageModerationQueueReportHandler.class.php