de2e241598
# Conflicts: # app/build.gradle |
||
---|---|---|
.. | ||
androidTest/java/org/session/libsession | ||
main | ||
test/java/org/session/libsession |
de2e241598
# Conflicts: # app/build.gradle |
||
---|---|---|
.. | ||
androidTest/java/org/session/libsession | ||
main | ||
test/java/org/session/libsession |