Joseph Donofry 6bb73f84a3 Merge master and fix conflicts		2020-06-09 20:51:36 -04:00
..
delegates	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00
emoji	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00
Avatar.qml	Make settings update immediately in qml and allow limiting timeline width	2020-05-26 22:54:51 +02:00
EncryptionIndicator.qml	Add un-encrypted warning icon for messages in encrypted rooms	2020-05-14 20:35:29 -04:00
ImageButton.qml	merge master into reactions	2020-05-07 20:53:24 -04:00
MatrixText.qml	Revert change from TextEdit to TextArea	2020-02-27 16:48:23 +01:00
Reactions.qml	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00
ScrollHelper.qml	Minor adjustments to emoji picker	2020-06-09 20:47:21 -04:00
StatusIndicator.qml	Speed up timeline by using global ToolTip and Menu	2020-02-02 00:27:51 +01:00
TimelineRow.qml	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00
TimelineView.qml	Merge master and fix conflicts	2020-06-09 20:51:36 -04:00