Merge branch 'refs/heads/pr/90' into next
authorMarcel Werk <burntime@woltlab.com>
Fri, 22 Jul 2016 13:46:00 +0000 (15:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 22 Jul 2016 13:46:00 +0000 (15:46 +0200)
commit96323aea3dc1fd2ac825536bc65e30d2e8859609
tree6e8923b7dc1f4962e92b3e4c5641cf4a3ee94186
parent7b77462ed0401eafa4f6879f39347df8e315f7d7
parent9888e764b379c63fd3771726da4bf1ac09581b4c
Merge branch 'refs/heads/pr/90' into next

# Conflicts:

# files/lib/data/conversation/message/ConversationMessageAction.class.php
# files/lib/form/ConversationMessageEditForm.class.php
files/lib/data/conversation/ConversationAction.class.php
files/lib/data/conversation/message/ConversationMessageAction.class.php
files/lib/form/ConversationAddForm.class.php