0x330a cf27760d01 Merge remote-tracking branch 'upstream/dev' into closed_groups ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/SessionContactDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	app/src/main/res/values/strings.xml
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java

2023-01-25 14:17:22 +11:00

..

src

Merge remote-tracking branch 'upstream/dev' into closed_groups

2023-01-25 14:17:22 +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