ericdecanini e87d97083f Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt

2022-06-29 12:02:34 +02:00

..

sampledata

Add required resources.

2022-05-27 15:25:59 +03:00

signature

…

src

Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication

2022-06-29 12:02:34 +02:00

.gitignore

…

build.gradle

Merge pull request #6399 from vector-im/feature/bma/flipper_version

2022-06-29 10:32:24 +02:00

lint.xml

Small improvement on lint.xml file

2022-05-16 12:23:10 +02:00

proguard-rules.pro

…