0x330a d01e27c671

Merge remote-tracking branch 'upstream/dev' into libsession-integration ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java

2023-01-24 16:32:07 +11:00

..

protobuf

Merge remote-tracking branch 'upstream/dev' into libsession-integration

2023-01-24 16:32:07 +11:00

src/main

Merge remote-tracking branch 'upstream/dev' into libsession-integration

2023-01-24 16:32:07 +11:00

.gitignore

restructure and unite service android/java to libsignal

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

build.gradle

Paged conversation recycler, update compile sdk version 31 (#1049)

2022-12-19 11:29:05 +11:00