79bc2b68c2
Change-Id: I0ff9f86482ed8f6f43604592e37e507da7764495 Conflicts: vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt |
||
|---|---|---|
| .. | ||
| signature | ||
| src | ||
| build.gradle | ||
| proguard-rules.pro | ||