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
..
java/org/session/libsession	Merge remote-tracking branch 'upstream/dev' into closed_groups	2023-01-25 14:17:22 +11:00
res	refactor: replacing the media loader calls to no longer bucket them by dates	2022-11-24 09:18:35 +11:00
AndroidManifest.xml	Fix missing compile target	2021-05-18 14:08:21 +10:00