ericdecanini c73c36eb26 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/MigrateSessionTo032.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt		2022-07-18 15:05:04 +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-18 15:05:04 +02:00
.gitignore
build.gradle	Merge pull request #6478 from vector-im/feature/bma/nightly	2022-07-18 14:22:15 +02:00
lint.xml	Small improvement on lint.xml file	2022-05-16 12:23:10 +02:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00