ericdecanini ee941cf88d Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt

2022-07-20 10:56:07 +02:00

..

sampledata

Add required resources.

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

signature

Setup nightly buildType

2022-07-05 16:07:12 +02:00

src

Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent

2022-07-20 10:56:07 +02:00

.gitignore

…

build.gradle

Fix error when building `./gradlew assembleGplayNightly. Just reordering lines...

2022-07-19 12:50:47 +02:00

lint.xml

Small improvement on lint.xml file

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

proguard-rules.pro

…