ericdecanini 41d859dc5b Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt

2022-08-05 17:10:36 +02:00

..

androidTest/java/im/vector/app

Disable 'Enable biometrics' option if there are not biometric authenticators enrolled. (#6714)

2022-08-02 15:31:08 +02:00

debug

lifting the live location sharing build flag to the config along with debug toggle

2022-08-02 14:31:46 +01:00

fdroid

Change name of fun.

2022-07-26 17:47:49 +02:00

gplay

Change name of fun.

2022-07-26 17:47:49 +02:00

main

Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal

2022-08-05 17:10:36 +02:00

nightly/res/xml

Add sources for nightly. Use release version, change AnalyticsConfig.kt and shortcuts.xml.

2022-07-06 15:37:21 +02:00

release

moving analytics config to the config module, it's now up to forks to opt out rather than relying on the package name to not be vector

2022-08-02 14:31:23 +01:00

sharedTest/java/im/vector/app/test/shared

…

test/java

Merge pull request #6654 from vector-im/feature/mna/update-sending-period-lls

2022-08-04 14:17:00 +02:00