ericdecanini 6df88fba59 Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
#	vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt

2022-06-08 12:59:54 +02:00

..

docs

Package have been renamed, so also rename it here.

2022-05-20 21:14:42 +02:00

src

Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment

2022-06-08 12:59:54 +02:00

.gitignore

first commit

2018-10-03 17:58:12 +02:00

build.gradle

Merge pull request #6229 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.12

2022-06-08 10:04:08 +01:00

proguard-rules.pro

Remove dependency to org.greenrobot.eventbus library

2021-01-05 18:56:24 +01:00