SpiritCroc db6cfd3054 Merge tag 'v1.1.7' into sc ... Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32 Conflicts: .idea/codeStyles/Project.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/values-ca/strings.xml vector/src/main/res/values-cs/strings.xml vector/src/main/res/values-de/strings.xml vector/src/main/res/values-et/strings.xml vector/src/main/res/values-fa/strings.xml vector/src/main/res/values-fr/strings.xml vector/src/main/res/values-it/strings.xml vector/src/main/res/values-sq/strings.xml vector/src/main/res/values-sv/strings.xml vector/src/main/res/values-vi/strings.xml vector/src/main/res/values-zh-rTW/strings.xml vector/src/main/res/values/strings.xml vector/src/main/res/xml/vector_settings_labs.xml		2021-05-12 16:01:36 +02:00
..
codeStyleConfig.xml
Project.xml