Files
session-android/libsession
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
..