erinn 21a905eb3b Merge branch 'master' of git.openprivacy.ca:cwtch.im/ui into ebf201902131852		2019-02-13 18:53:52 -08:00
..
AddGroupPane.qml	Cleanup	2019-02-12 20:10:46 -08:00
GroupSettingsPane.qml	Accept/Reject Invitations and Remove Game 2	2019-02-13 18:42:13 -08:00
OverlayPane.qml	Accept/Reject Invitations and Remove Game 2	2019-02-13 18:42:13 -08:00
PeerSettingsPane.qml	Deleting Contacts, Alerting, Click to Talk	2019-02-13 00:09:04 -08:00
SettingsPane.qml	merge	2019-02-13 18:53:36 -08:00