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/libsession
SessionHero01 8457df34c4
Merge remote-tracking branch 'origin/release/1.21.0' into merge-release-1.21.0
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
3 months ago
..
src Merge remote-tracking branch 'origin/release/1.21.0' into merge-release-1.21.0 3 months ago
.gitignore
build.gradle New group implementation (#4) 5 months ago