Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

matrix-android-sdk
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

787bb776

Commit 787bb776 authored 3 years ago by Benoit Marty

Downloads
- Plain Diff

Merge branch 'release/1.3.14' into develop

parents 3829d8d6 aee72b9e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 5 additions, 0 deletions

CHANGES.md
gradle.properties 1 addition, 1 deletion

gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt 1 addition, 1 deletion

...atrix/android/sdk/internal/crypto/DefaultCryptoService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt 2 additions, 2 deletions

...sdk/internal/database/helper/TimelineEventEntityHelper.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt 1 addition, 1 deletion

...rg/matrix/android/sdk/internal/session/room/RoomGetter.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt 2 additions, 2 deletions

...droid/sdk/internal/session/room/timeline/TimelineChunk.kt

with 12 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment