element-android-Github/matrix-sdk-android-flow
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
..
src/main Merge branch 'develop' into feature/aris/threads 2022-01-03 11:08:22 +02:00
.gitignore 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
build.gradle No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4 2021-10-19 19:06:27 +02:00
consumer-rules.pro 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
proguard-rules.pro 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