mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-28 20:45:17 +00:00
b77a35a171
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle |