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
..
account	code review	2022-05-25 18:40:33 +02:00
api/network	rename testHelpers and make constructor private	2022-05-25 18:40:33 +02:00
common	Create a SyncService and move some methods from Session there.	2022-06-08 09:53:33 +02:00
internal	Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment	2022-06-08 12:59:54 +02:00
ordering	Reformats project based on editorconfig	2022-05-05 19:10:35 +02:00
session	Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment	2022-06-08 12:59:54 +02:00
InstrumentedTest.kt	Fix ktlint error	2022-06-06 18:56:05 +01:00
LiveDataTestObserver.java	- Fix github actions ktlint reports	2022-01-06 00:26:47 +02:00
MainThreadExecutor.java	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
PermalinkParserTest.kt	Reformats project based on editorconfig	2022-05-05 19:10:35 +02:00
SingleThreadCoroutineDispatcher.kt	Reformats project based on editorconfig	2022-05-05 19:10:35 +02:00
Util.kt	Fix bad copyright	2022-05-18 14:12:44 +02:00