master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4b5aab3c8d
schildichat-android/matrix-sdk-android
History
SpiritCroc 0b4f56d7a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Icb4d672fc9d301803b300d6ac25b348780f11e6c

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/res/layout/fragment_known_users.xml
	vector/src/main/res/layout/fragment_user_list.xml
2020-11-29 12:51:43 +01:00
..
src Merge remote-tracking branch 'upstream/master' into sc 2020-11-29 12:51:43 +01:00
.gitignore
build.gradle Realm 10: upgrade lib and make it works on our current code. 2020-11-03 16:53:30 +01:00
lint.xml Set severity of ObsoleteSdkInt to error 2020-08-18 00:46:37 +02:00
proguard-rules.pro Fix / Serialization issues 2020-07-02 19:26:05 +02:00