element-ios/Riot/Modules/Integrations
Doug b9dc5d6eca 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
..
WidgetPermission WidgetPermissionViewController use a clear background for avatar image view. 2019-11-29 10:13:01 +01:00
WidgetPicker Merge branch 'develop' into doug/4484_contacts_access 2021-09-30 11:14:02 +01:00
Widgets Merge branch 'develop' into doug/4484_contacts_access 2021-09-30 11:14:02 +01:00
IntegrationManagerViewController.h Structure project almost by features. Start by organizing view controllers. 2018-07-10 10:21:20 +02:00
IntegrationManagerViewController.m Merge branch 'develop' into doug/4484_contacts_access 2021-09-30 11:14:02 +01:00