element-ios/Riot/Managers/Settings
Gil Eluard 27f51f863b Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00
..
Shared Swift: NSURL -> URL 2019-11-22 12:20:57 +01:00
RiotSettings.swift Merge branch 'develop' into element_4218 2021-04-20 15:27:27 +02:00