Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 31 Jul 2017 11:20:06 +0000 (13:20 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 31 Jul 2017 11:20:06 +0000 (13:20 +0200)
commit415390e517cfcc7f5bade03d6dc101afbb2509d5
tree73a8ad0450a1bff67f89f0940148c7107b5907b1
parente0415efbfe1aff345a4ebb5ddbf4d81db53978c9
parent4251df8250f523dba3e47c9b0234562e9536a69c
Merge remote-tracking branch 'refs/remotes/origin/3.0'
files/lib/data/conversation/ConversationAction.class.php
language/de.xml
language/en.xml
templates/conversation.tpl
templates/conversationList.tpl