resources/qml/TimelineView.qml · bfcfa79d53929b1a7607f82fe8c10a82fa13e2dd · Nheko Reborn / nheko

4 years ago

Merge remote-tracking branch 'origin/master' into new-event-store · de7ec4d2

Nicolas Werner authored 4 years ago

Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp

de7ec4d2

History

Merge remote-tracking branch 'origin/master' into new-event-store

Nicolas Werner authored 4 years ago

Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp

Code owners

Assign users and groups as approvers for specific file changes. Learn more.