matrixion/resources/qml/delegates
Nicolas Werner de7ec4d2b3 Merge remote-tracking branch 'origin/master' into new-event-store
Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp
2020-08-17 20:40:33 +02:00
..
FileMessage.qml Use Item for transparent rectangles 2020-04-10 08:48:30 +02:00
ImageMessage.qml Fix more non integer heights 2020-07-25 22:10:30 +02:00
MessageDelegate.qml Merge remote-tracking branch 'origin/master' into new-event-store 2020-08-17 20:40:33 +02:00
NoticeMessage.qml Clip replies by default 2020-05-13 01:09:45 +02:00
Pill.qml Change redaction color that accidentally got committed 2020-05-07 22:22:41 -04:00
Placeholder.qml Show event type string in placeholder 2020-01-23 20:59:17 +01:00
PlayableMediaMessage.qml Fix more non integer heights 2020-07-25 22:10:30 +02:00
Reply.qml Clip replies by default 2020-05-13 01:09:45 +02:00
TextMessage.qml Fix binding loop and non integer text height 2020-07-25 22:08:02 +02:00