mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/matrix-sdk-android/src
History
SpiritCroc 965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
2023-04-05 11:28:26 +02:00
..
androidTest Support for v2 of MSC3903 2023-02-13 15:07:44 +00:00
debug/java/org/matrix/android/sdk/internal/network/interceptors Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
main Merge tag 'v1.5.30' into sc 2023-04-05 11:28:26 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk Merge remote-tracking branch 'origin/develop' into feature/fre/apply_push_rules_after_decryption 2023-03-06 09:11:48 +01:00