SchildiChat-android/vector/src
ericdecanini 8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-25 17:35:31 +02:00
..
androidTest/java/im/vector/app Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
debug Labs flag added for enabling live location sharing. 2022-05-19 12:01:42 +03:00
fdroid Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
gplay Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
main Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 2022-05-25 17:35:31 +02:00
release Lifting debug overrides to their own abstraction (#5361) 2022-03-02 10:08:43 +00:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 2022-05-25 17:35:31 +02:00