SchildiChat-android/matrix-sdk-android/src
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/org/matrix/android/sdk Rename `tryThis` to `tryOrNull` 2020-09-21 18:26:35 +02:00
debug/java/org/matrix/android/sdk/internal Rename package of SDK modules 2020-08-13 12:50:58 +02:00
main Merge remote-tracking branch 'upstream/master' into sc 2020-09-27 13:55:40 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors Rename package of SDK modules 2020-08-13 12:50:58 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared Rename package of SDK modules 2020-08-13 12:50:58 +02:00
test/java/org/matrix/android/sdk Rename class 2020-08-25 17:34:43 +02:00