You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Joseph Donofry 7afb164244 Merge remote-tracking branch 'origin/master' into presence		5 years ago
..
delegates	Merge master and fix conflicts	5 years ago
emoji	Fix build issue on some versions of clang	5 years ago
Avatar.qml	Show presence and set custom status messages	5 years ago
EncryptionIndicator.qml	Add un-encrypted warning icon for messages in encrypted rooms	5 years ago
ImageButton.qml	merge master into reactions	5 years ago
MatrixText.qml	Revert change from TextEdit to TextArea	5 years ago
Reactions.qml	Remove signals in favor of direct function calls	5 years ago
ScrollHelper.qml	Fix UserSettings in QML	5 years ago
StatusIndicator.qml	Speed up timeline by using global ToolTip and Menu	5 years ago
TimelineRow.qml	Remove signals in favor of direct function calls	5 years ago
TimelineView.qml	Merge remote-tracking branch 'origin/master' into presence	5 years ago