ceokot 748407f951 Merge branch 'dev' into feat_id_blinding ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/LokiAPIDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt

2022-05-18 13:44:19 +10:00

..

protobuf

Add one on one calls over clearnet (#864)

2022-04-19 14:25:40 +10:00

src

Merge branch 'dev' into feat_id_blinding

2022-05-18 13:44:19 +10:00

.gitignore

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

build.gradle

refactor: remove PersistentLogger.java and fix libsignal build.gradle minSdkVersion

2021-07-15 16:56:13 +10:00