SchildiChat-android

mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-25 13:58:34 +01:00

History

ariskotsomitopoulos ac5caccdf9 Merge branch 'develop' into feature/aris/threads

# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml

2022-01-07 13:29:43 +02:00

benchmark

adding benchmarking script to start monitoring build times

2021-09-23 16:20:41 +01:00

check

Merge branch 'develop' into feature/aris/threads

2022-01-07 13:29:43 +02:00

emojis

Sync Emojis

2021-11-15 00:01:55 +00:00

install

Add a script to download and install APK from Buildkite