GitHub-Mirror/riotX-android
1
0
Fork 1
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00
Code Issues Releases Wiki Activity
Files
task/eric/space-switching-tests
riotX-android/matrix-sdk-android-flow
History
ericdecanini 067c485e4f Merge remote-tracking branch 'origin/develop' into feature/nfe/legacy_group_removal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
2022-07-07 15:44:42 +01:00
..
src/main
Merge remote-tracking branch 'origin/develop' into feature/nfe/legacy_group_removal
2022-07-07 15:44:42 +01:00
.gitignore
Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"
2021-10-07 11:11:44 +02:00
build.gradle
Bring back a false positive
2022-05-18 18:22:36 +02:00
consumer-rules.pro
Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"
2021-10-07 11:11:44 +02:00
proguard-rules.pro
Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"
2021-10-07 11:11:44 +02:00