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/libsession/src/main/java/org/session
History
0x330a 9dfb6f84b7
Merge remote-tracking branch 'upstream/master' into closed_groups 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
2023-10-16 15:59:40 +11:00
..
libsession Merge remote-tracking branch 'upstream/master' into closed_groups 2023-10-16 15:59:40 +11:00