mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-29 04:55:15 +00:00
d01e27c671
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle |