Doug 997ee54f20 Merge branch 'develop' into doug/4484_contacts_access ...

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

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

..

DataSources

Show/Hide public directory in Unified Search

2021-04-20 10:31:04 +02:00

Files

vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.

2021-09-30 09:40:12 +03:00

Messages

vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.

2021-09-30 09:40:12 +03:00

Rooms

vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.

2021-09-30 09:40:12 +03:00

Views

vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.

2021-09-30 09:40:12 +03:00

UnifiedSearchViewController.h

Navigation: Add possibility to instantiate each tab bar item controller programmatically.

2021-05-20 21:29:08 +02:00

UnifiedSearchViewController.m

Merge branch 'develop' into doug/4484_contacts_access

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