Doug a300cab626 Merge branch 'develop' into doug/4479_media_size_selection ... # Conflicts: # Riot/Managers/Settings/RiotSettings.swift		2021-09-06 17:04:22 +01:00
..
DeactivateAccount	Adopt consolidated logging mechanism (#4370)	2021-06-03 11:30:07 +03:00
Discovery	Fixes #4746 - It is very easy to make duplicate rooms	2021-08-26 17:48:24 +03:00
IdentityServer	Trim whitespace from the identity server text entry and don't allow an empty string.	2021-07-23 14:27:25 +01:00
KeyBackup	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Language	Remove old AppDelegate imports.	2020-08-31 19:38:06 +02:00
PhoneCountry	Remove old AppDelegate imports.	2020-08-31 19:38:06 +02:00
Security	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
SignOut	Implements #4693 - Alert users of Element on iOS11 deprecation.	2021-08-25 13:57:32 +03:00
Views	Settings: Improve new phone number cell UI.	2020-10-01 12:26:02 +02:00
SettingsViewController.h	Make SettingsViewController directly instantiable.	2020-05-04 19:58:06 +02:00
SettingsViewController.m	Revert "#4693 - Drop iOS 11 support."	2021-09-06 18:24:26 +03:00