Benoit Marty 9802ed08e3 Merge branch 'feature/bma/new_commands' of github.com:vector-im/element-android into feature/bma/new_commands ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt		2021-10-04 16:00:31 +02:00
..
assets	New voip design: clean after benoit review	2021-08-26 11:08:34 +02:00
java/im/vector/app	Merge branch 'feature/bma/new_commands' of github.com:vector-im/element-android into feature/bma/new_commands	2021-10-04 16:00:31 +02:00
res	Merge branch 'feature/bma/new_commands' of github.com:vector-im/element-android into feature/bma/new_commands	2021-10-04 16:00:31 +02:00
AndroidManifest.xml	Merge pull request #3953 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.6.0	2021-09-30 14:25:43 +02:00