Commit bff1cfa0 authored by Dennis Beier's avatar Dennis Beier
Browse files

Merge branch 'master' of https://git.fairkom.net/chat/fairchat into android8Push

parents ba8d57b4 e21c75a0
Pipeline #665 passed with stage
in 2 minutes and 32 seconds
Subproject commit ab822c209f3558dc5a47447f996ee51bf26baee2
Subproject commit f625661d2ab1e41772b9776299a509010bd43fc7
......@@ -82,8 +82,22 @@ Item {
anchors.verticalCenter: parent.verticalCenter
id:connectionText
text: qsTr("Connection:")
MouseArea{
anchors.fill: parent;
onClicked:{
console.log("resetting connection");
rocketChatController.resetConnection();
}
}
}
ConnectionIndicator {
MouseArea{
anchors.fill: parent;
onClicked:{
console.log("resetting connection");
rocketChatController.resetConnection();
}
}
}
}
Button{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment