Doug 7dea78bae9 Merge branch 'develop' into doug/4479_media_size_selection ...

# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift

2021-08-16 10:01:54 +01:00

..

DeactivateAccount

Adopt consolidated logging mechanism (#4370)

2021-06-03 11:30:07 +03:00

Discovery

Fix class keyword deprecation warnings everywhere!

2021-07-09 17:05:43 +01: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

Fix class keyword deprecation warnings everywhere!

2021-07-09 17:05:43 +01: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

Merge branch 'develop' into doug/4479_media_size_selection

2021-08-16 10:01:54 +01:00