filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-15 10:58:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
3bd21d04d8
SchildiChat-android/matrix-sdk-android
History
ariskotsomitopoulos 3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02:00
..
src Merge branch 'develop' into feature/aris/threads 2022-01-11 14:09:49 +02:00
.gitignore
build.gradle Merge branch 'develop' into feature/aris/threads 2022-01-11 14:09:49 +02:00
proguard-rules.pro