mirror of
https://github.com/vector-im/element-ios.git
synced 2024-10-01 16:52:40 +00:00
b9dc5d6eca
# Conflicts: # Riot/Assets/en.lproj/Vector.strings # Riot/Generated/Strings.swift # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Settings/SettingsViewController.m |
||
---|---|---|
.. | ||
ContactsDataSource.h | ||
ContactsDataSource.m |