SpiritCroc 43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc ... Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt vector/src/main/java/im/vector/app/core/utils/UserColor.kt vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt vector/src/main/res/layout/activity_signed_out.xml vector/src/main/res/layout/fragment_login.xml vector/src/main/res/layout/fragment_login_captcha.xml vector/src/main/res/layout/fragment_login_generic_text_input_form.xml vector/src/main/res/layout/fragment_login_reset_password.xml vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml vector/src/main/res/layout/fragment_login_reset_password_success.xml vector/src/main/res/layout/fragment_login_server_selection.xml vector/src/main/res/layout/fragment_login_server_url_form.xml vector/src/main/res/layout/fragment_login_signup_signin_selection.xml vector/src/main/res/layout/fragment_login_splash.xml vector/src/main/res/layout/fragment_login_terms.xml vector/src/main/res/layout/fragment_login_wait_for_email.xml vector/src/main/res/layout/item_login_header.xml vector/src/main/res/values-land/styles_login.xml vector/src/main/res/values/styles_login.xml		2020-09-27 13:55:40 +02:00
..
androidTest/java/im/vector/app	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00
debug	Use a singleton for default shared pref	2020-09-09 11:45:47 +02:00
fdroid	Restore TestBatteryOptimization	2020-09-11 11:31:37 +02:00
gplay	Merge remote-tracking branch 'upstream/master' into sc_1.0.7	2020-09-17 12:03:17 +02:00
main	Merge remote-tracking branch 'upstream/master' into sc	2020-09-27 13:55:40 +02:00
release	Rename package im.vector.riotx to im.vector.app (IDE, other variants)	2020-08-03 18:46:29 +02:00
sharedTest/java/im/vector/app/test/shared	Rename package im.vector.riotx to im.vector.app (IDE)	2020-08-03 18:46:29 +02:00
test/java/im/vector/app	Fix test compilation issue (no detected since Olm was not available)	2020-09-24 12:46:14 +02:00