mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
Merge branch 'develop' into feature/valere/timeline_active_call_rendering
This commit is contained in:
+1
-4
@@ -90,7 +90,6 @@ sealed interface NotificationContent {
|
||||
val question: String,
|
||||
) : MessageLike
|
||||
|
||||
// TODO put real implementation
|
||||
data object Beacon : MessageLike
|
||||
}
|
||||
|
||||
@@ -119,9 +118,7 @@ sealed interface NotificationContent {
|
||||
data class RoomTopic(val topic: String) : StateEvent
|
||||
data object SpaceChild : StateEvent
|
||||
data object SpaceParent : StateEvent
|
||||
|
||||
// TODO put real implementation
|
||||
data object Beacon : StateEvent
|
||||
data object BeaconInfo : StateEvent
|
||||
}
|
||||
|
||||
data class Invite(
|
||||
|
||||
Reference in New Issue
Block a user