TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 02:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
d01e27c671
session-android/libsession
History
0x330a d01e27c671
Merge remote-tracking branch 'upstream/dev' into libsession-integration 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
#	libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
2023-01-24 16:32:07 +11:00
..
src Merge remote-tracking branch 'upstream/dev' into libsession-integration 2023-01-24 16:32:07 +11:00
.gitignore restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
build.gradle Merge remote-tracking branch 'upstream/dev' into libsession-integration 2023-01-24 16:32:07 +11:00