Merge branch 'master' into callkit

Browse Source

# Conflicts:
#	Riot/AppDelegate.m
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/ViewController/SettingsViewController.m

...

This commit is contained in:

Giom Foret

2017-08-25 16:48:13 +02:00

parent b11c9fd2d0 63c82f4d09

commit 74b739b735

283 changed files with 19736 additions and 3930 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

Riot/ViewController/SettingsViewController.m

+1000 -599

File diff suppressed because it is too large Load Diff