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
jubb 38164ea23d Merge remote-tracking branch 'upstream/master' into calls
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/res/values/strings.xml
#	gradle.properties
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt
#	libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
4 years ago
..
protobuf feat: include latest proto 4 years ago
src Merge remote-tracking branch 'upstream/master' into calls 4 years ago
.gitignore restructure and unite service android/java to libsignal 5 years ago
build.gradle refactor: remove PersistentLogger.java and fix libsignal build.gradle minSdkVersion 4 years ago