oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
session-android/app/src/main/java/org/thoughtcrime
History
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
..
securesms Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge 2021-02-11 14:12:22 +11:00