Merge branch 'develop' into doug/4484_contacts_access

Browse Source

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m

...

This commit is contained in:

Doug

2021-09-30 11:14:02 +01:00

parent 5d3c3cf5d7 313e666017

commit 997ee54f20

414 changed files with 14789 additions and 4140 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

367

Riot/Modules/Settings/SettingsViewController.m

File diff suppressed because it is too large Load Diff