master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
95850440bd
schildichat-android/vector/src/main
History
SpiritCroc 95850440bd Merge remote-tracking branch 'upstream/master' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/res/drawable/bg_login_server.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
2020-07-17 13:39:52 +02:00
..
assets Missing copyrights 2020-07-10 14:38:23 +02:00
java/im/vector/riotx Merge remote-tracking branch 'upstream/master' into sc 2020-07-17 13:39:52 +02:00
res Merge remote-tracking branch 'upstream/master' into sc 2020-07-17 13:39:52 +02:00
AndroidManifest.xml Merge remote-tracking branch 'upstream/master' into sc 2020-07-17 13:39:52 +02:00