0x330a 36df2b37df Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java

2023-07-25 13:14:29 +10:00

..

proguard

fix: Selected message theme colours and crash fixes (#1025)

2022-10-24 15:45:26 +11:00

src

Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages

2023-07-25 13:14:29 +10:00

.gitignore

…

build.gradle

build: update build number

2023-07-14 18:29:47 +10:00

google-services.json

…

lint-baseline.xml

App's gradle config cleanup.

2020-11-26 12:41:59 +11:00

lint.xml

…