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
jubb 5a892b2932 Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
#	libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java
4 years ago
..
src Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge 4 years ago
.gitignore
build.gradle sync update to libsession & clean 4 years ago
consumer-rules.pro
proguard-rules.pro