Morgan Pretty dc9458f313 Merge remote-tracking branch 'upstream/dev' into feature/unread-mention-indicator ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt
#	libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt

2023-01-24 14:02:08 +11:00

..

proguard

Play fixes (#1017)

2022-10-24 14:24:57 +11:00

src

Merge remote-tracking branch 'upstream/dev' into feature/unread-mention-indicator

2023-01-24 14:02:08 +11:00

.gitignore

…

build.gradle

Merge remote-tracking branch 'upstream/dev' into feature/unread-mention-indicator

2023-01-24 14:00:07 +11:00

google-services.json

…

lint-baseline.xml

…

lint.xml

…