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		2021-02-11 14:12:22 +11:00
..
java/org/session/libsignal	Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge	2021-02-11 14:12:22 +11:00
AndroidManifest.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00