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/src
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
5 years ago
..
androidTest/java/org/session/libsession restructure and unite service android/java to libsignal 5 years ago
main Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge 5 years ago
test/java/org/session/libsession restructure and unite service android/java to libsignal 5 years ago