Gil Eluard 16ff9fb44a Merge branch 'develop' into element_4236 ...

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

2021-04-20 10:38:30 +02:00

..

AppConfiguration.swift

Improve App Config:

2020-12-01 09:07:17 +01:00

AppIdentifiers.xcconfig

Prepare for new sprint

2021-04-19 18:01:06 +02:00

BuildSettings.swift

Merge branch 'develop' into element_4236

2021-04-20 10:38:30 +02:00

CommonConfiguration.swift

Room lists: Remove shields on room avatars

2021-03-17 15:32:01 +01:00

Configurable.swift

AppConfig: Fix Steve's remarks

2020-07-29 10:05:45 +02:00

Project-Debug.xcconfig

XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig

2021-02-11 08:56:05 +01:00

Project-Release.xcconfig

XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig

2021-02-11 08:56:05 +01:00

Project-Warnings.xcconfig

XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig

2021-02-11 08:56:05 +01:00

Project.xcconfig

XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig

2021-02-11 08:56:05 +01:00