element-ios/Riot/Managers/Settings
Doug e324767d7d Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
..
Shared Swift: NSURL -> URL 2019-11-22 12:20:57 +01:00
RiotSettings.swift Merge branch 'master' into develop 2021-11-17 17:36:44 +00:00