mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-27 14:30:42 +00:00
Merge remote-tracking branch 'upstream/calls' into rtc_calls
# Conflicts: # app/build.gradle
This commit is contained in:
# Conflicts: # app/build.gradle