You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-android/libsession
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
8 months ago
..
src Merge remote-tracking branch 'origin/dev' into release/1.19.1 8 months ago
.gitignore restructure and unite service android/java to libsignal 4 years ago
build.gradle Merge remote-tracking branch 'origin/dev' into release/1.19.1 8 months ago