Doug f1b341d8e7 Merge branch 'master' into develop ...

# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m

2021-11-17 17:36:44 +00:00

..

DeactivateAccount

Improve the Obj-C Generated Interface Header Name definition

2021-10-26 17:42:33 +02:00

Discovery

Address Steve's comments.

2021-10-20 19:29:23 +01:00

IdentityServer

Merge pull request #4960 from vector-im/steve/4734_master_tab_bar_refacto

2021-10-11 17:23:20 +02:00

KeyBackup

Fix class keyword deprecation warnings everywhere!

2021-07-09 17:05:43 +01:00

Language

Improve the Obj-C Generated Interface Header Name definition

2021-10-26 17:42:33 +02:00

PhoneCountry

Improve the Obj-C Generated Interface Header Name definition

2021-10-26 17:42:33 +02:00

Security

Improve the Obj-C Generated Interface Header Name definition

2021-10-26 17:42:33 +02:00

SignOut

Implements #4693 - Alert users of Element on iOS11 deprecation.

2021-08-25 13:57:32 +03:00

Views

Improve the Obj-C Generated Interface Header Name definition

2021-10-26 17:42:33 +02:00

SettingsViewController.h

Make SettingsViewController directly instantiable.

2020-05-04 19:58:06 +02:00

SettingsViewController.m

Merge branch 'master' into develop

2021-11-17 17:36:44 +00:00