ericdecanini 8b0fba2ef5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt

2022-08-16 11:58:25 +02:00

..

sampledata

…

signature

…

src

Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal

2022-08-16 11:58:25 +02:00

.gitignore

…

build.gradle

Merge pull request #6492 from vector-im/dependabot/gradle/com.github.UnifiedPush-android-connector-2.0.1

2022-08-11 16:21:47 +01:00

lint.xml

Ignore PluralsCandidate, I do not know why it is reported by Danger, since this is a warning. Also make this issue an error.

2022-07-29 10:02:40 +02:00

proguard-rules.pro

…