SessionHero01 7c1efeaaaa

Merge remote-tracking branch 'origin/dev' into closed_groups ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
#	app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt

2024-10-23 15:16:43 +11:00

..

proguard

Play fixes (#1017)

2022-10-24 14:24:57 +11:00

src

Merge remote-tracking branch 'origin/dev' into closed_groups

2024-10-23 15:16:43 +11:00

.gitignore

…

build.gradle

Merge remote-tracking branch 'origin/dev' into closed_groups

2024-10-23 15:16:43 +11:00

geolite2_country_blocks_ipv4.csv

Optimise and test IP2Country (#1684)

2024-10-23 13:48:29 +11:00

google-services.json

…

ipToCode.gradle.kts

Optimise and test IP2Country (#1684)

2024-10-23 13:48:29 +11:00

lint-baseline.xml

…

lint.xml

…