mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
aadf1b7d67
# Conflicts: # Config/BuildSettings.swift # Riot/Generated/Strings.swift # Riot/Modules/Home/HomeViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m |
||
---|---|---|
.. | ||
InfoPlist.strings | ||
Localizable.strings | ||
Untranslated.strings | ||
Vector.strings |