de2e241598
# Conflicts: # app/build.gradle |
||
---|---|---|
.. | ||
java/org/session/libsession | ||
res | ||
AndroidManifest.xml |
de2e241598
# Conflicts: # app/build.gradle |
||
---|---|---|
.. | ||
java/org/session/libsession | ||
res | ||
AndroidManifest.xml |