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 46303e2168
Merge remote-tracking branch 'origin/dev' into merge-1.21.0
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
1 month ago
..
src Merge remote-tracking branch 'origin/dev' into merge-1.21.0 1 month ago
.gitignore restructure and unite service android/java to libsignal 4 years ago
build.gradle New group implementation (#4) 5 months ago