TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
50929b8970
session-android/libsession
History
fanchao 50929b8970 Merge remote-tracking branch 'origin/dev' into release/1.19.1 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
#	gradle.properties
2024-08-14 10:47:16 +10:00
..
src Merge remote-tracking branch 'origin/dev' into release/1.19.1 2024-08-14 10:47:16 +10:00
.gitignore restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
build.gradle Merge remote-tracking branch 'origin/dev' into release/1.19.1 2024-08-14 10:47:16 +10:00