SchildiChat-android/vector/src
NIkita Fedrunov ce3fd43389 Merge branch 'develop' into feature/nfe/spaces_screens_tests
# Conflicts:
#	vector/src/androidTest/java/im/vector/app/EspressoExt.kt
#	vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
2022-02-16 13:42:39 +01:00
..
androidTest/java/im/vector/app Merge branch 'develop' into feature/nfe/spaces_screens_tests 2022-02-16 13:42:39 +01:00
debug fixing line length 2022-01-12 13:51:53 +00:00
fdroid Fix "@JvmStatic used for @Provides function in an object class" Lint warning. 2021-11-19 15:29:11 +01:00
gplay Fix "@JvmStatic used for @Provides function in an object class" Lint warning. 2021-11-19 15:29:11 +01:00
main Merge pull request #5203 from vector-im/feature/dla/fix_consult_transfer 2022-02-14 19:54:09 +01:00
release Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
sharedTest/java/im/vector/app/test/shared Rename package im.vector.riotx to im.vector.app (IDE) 2020-08-03 18:46:29 +02:00
test/java/im/vector/app Code review fixes. 2022-02-03 12:53:59 +03:00