master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2e9195df2b
schildichat-android/matrix-sdk-android/src
History
SpiritCroc 2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2020-09-17 12:03:17 +02:00
..
androidTest/java/org/matrix/android/sdk Fix issue on test compilation 2020-09-16 20:40:05 +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_1.0.7 2020-09-17 12:03:17 +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