SchildiChat-android/gradle-wrapper.properties at 6d1cb063731e1bb915c67a78d158390aa913116d - SchildiChat-android - Gitea

filippodb/SchildiChat-android

mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 10:03:06 +01:00

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

6 lines

202 B

INI

Raw Blame History

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists