mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-24 18:45:19 +00:00
50929b8970
# Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt # app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java # gradle.properties |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle |