session-android/app/src/main
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
..
assets restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
java/org/thoughtcrime/securesms Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge 2021-02-11 14:12:22 +11:00
protobuf Unused code cleanup. 2020-12-02 23:01:04 +11:00
res ban labels added in FR + Invite of settings menu added in translations (#414) 2021-02-08 14:12:21 +11:00
AndroidManifest.xml Job cleanup. 2020-12-17 12:47:18 +11:00