ariskotsomitopoulos 694b8de034 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # library/ui-styles/src/main/res/values/dimens.xml		2022-01-03 11:08:22 +02:00
..
java/org/matrix/android/sdk/flow	Merge branch 'develop' into feature/aris/threads	2022-01-03 11:08:22 +02:00
AndroidManifest.xml	Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"	2021-10-07 11:11:44 +02:00