You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-android/libsignal
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
2 years ago
..
protobuf fix: more merge conflict compile issues 2 years ago
src/main Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages 2 years ago
.gitignore restructure and unite service android/java to libsignal 5 years ago
build.gradle Paged conversation recycler, update compile sdk version 31 (#1049) 3 years ago