ericdecanini 9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt		2022-03-15 15:48:17 +01:00
..
androidTest	Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list	2022-03-15 15:14:26 +01:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
main	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-15 15:48:17 +01:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-14 12:02:04 +01:00