1.0.3 Conflicts: vector/build.gradle vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/res/layout/fragment_login_server_selection.xml vector/src/main/res/layout/fragment_login_splash.xml vector/src/main/res/layout/item_login_header.xml vector/src/main/res/values/strings.xml vector/src/main/res/values/styles_login.xml |
||
|---|---|---|
| .. | ||
| androidTest/java/im/vector/matrix/android | ||
| debug/java/im/vector/matrix/android/internal | ||
| main | ||
| release/java/im/vector/matrix/android/internal/network/interceptors | ||
| sharedTest/java/im/vector/matrix/android/test/shared | ||
| test/java/im/vector/matrix/android | ||