Merge remote-tracking branch 'upstream/calls' into rtc_calls

Browse Source

# Conflicts:
#	app/build.gradle

pull/864/head 1.12.1

jubb 4 years ago

parent 26e3159399 66db422c77

commit ae30d2f070

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available