Merge remote-tracking branch 'g1o/silent_initiate_distant_chat_api' into qml_app_chat_aesthetic

This commit is contained in:
Angela Mazzurco 2017-06-07 15:02:29 +02:00
commit cac5093f37
18 changed files with 319 additions and 40 deletions

View file

@ -78,7 +78,6 @@ QtObject {
return lastMessageList[chatId].lastMessage
}
return ""
}
}

View file

@ -174,9 +174,6 @@ Item
}
Row
{
anchors.right: parent.right