session-android/app/src/main
jubb 842cfc25a1 Merge branch 'dev' into trusted_attachment_download
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
2021-07-12 09:28:14 +10:00
..
assets restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
java/org/thoughtcrime/securesms Merge branch 'dev' into trusted_attachment_download 2021-07-12 09:28:14 +10:00
protobuf Unused code cleanup. 2020-12-02 23:01:04 +11:00
res Merge branch 'dev' into trusted_attachment_download 2021-07-12 09:28:14 +10:00
AndroidManifest.xml Clean & debug 2021-07-09 13:56:38 +10:00