session-android/app/src/main
0x330a 5bd6986055
Merge remote-tracking branch 'upstream/dev' into closed_groups
# Conflicts:
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
2023-10-02 10:55:26 +11:00
..
assets Add emoji reacts support (#889) 2022-09-04 21:03:32 +10:00
java/org/thoughtcrime/securesms Merge remote-tracking branch 'upstream/dev' into closed_groups 2023-10-02 10:55:26 +11:00
protobuf Unused code cleanup. 2020-12-02 23:01:04 +11:00
res Merge remote-tracking branch 'upstream/dev' into closed_groups 2023-10-02 10:55:26 +11:00
AndroidManifest.xml Merge remote-tracking branch 'upstream/dev' into closed_groups 2023-10-02 10:55:26 +11:00