* feature/ons/device_manager_current_session: (169 commits)
new app layouts invites (#6911)
bottom navigation tabs are removed for AppLayout (#6905)
focus input when changing server address
Fix copyright
Improve createRoomThreePidEvents for clarity
Remove roomCreatorUserId and use current userId by default
Remove useless explicit field type
Change visibility of LocalRoomThirdPartyInviteContent to internal
Remove useless apply in CreateLocalRoomStateEventsTask
Update doc
Extract condition to reduce code complexity
Verify tombstone event
Remove safe call
Add unit tests for CreateRoomFromLocalRoomTask
Add unit tests for CreateLocalRoomStateEventsTask
Set stateKey as empty by default
Create local room state events in dedicated task
Fix local events generation following the specification
Update CreateRoomParams from the potential FeaturePreset before persisting
Persists CreateRoomParams into LocalRoomSummaryEntity
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
* develop: (169 commits)
new app layouts invites (#6911)
bottom navigation tabs are removed for AppLayout (#6905)
focus input when changing server address
Fix copyright
Improve createRoomThreePidEvents for clarity
Remove roomCreatorUserId and use current userId by default
Remove useless explicit field type
Change visibility of LocalRoomThirdPartyInviteContent to internal
Remove useless apply in CreateLocalRoomStateEventsTask
Update doc
Extract condition to reduce code complexity
Verify tombstone event
Remove safe call
Add unit tests for CreateRoomFromLocalRoomTask
Add unit tests for CreateLocalRoomStateEventsTask
Set stateKey as empty by default
Create local room state events in dedicated task
Fix local events generation following the specification
Update CreateRoomParams from the potential FeaturePreset before persisting
Persists CreateRoomParams into LocalRoomSummaryEntity
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt