mirror of
https://github.com/oxen-io/session-android.git
synced 2025-05-22 16:58:22 +00:00

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt