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
SessionHero01 0cf6e22cca
Merge remote-tracking branch 'origin/release/1.21.0' into bring-1.21.0
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/mms/Slide.kt
2 months ago
..
protobuf [SES-3314] - Prevent replay attacks (#945) 2 months ago
src/main Merge remote-tracking branch 'origin/release/1.21.0' into bring-1.21.0 2 months ago
.gitignore restructure and unite service android/java to libsignal 4 years ago
build.gradle New group implementation (#4) 4 months ago