mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-23 01:45:52 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/fastlane
History
SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
2020-11-05 13:15:55 +01:00
..
fastlane/metadata/android [TMP] Automatic upstream merge preparation 2020-11-05 13:14:16 +01:00
metadata/android [TMP] Automatic upstream merge preparation 2020-11-05 13:14:16 +01:00