mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
aadf1b7d67
# Conflicts: # Config/BuildSettings.swift # Riot/Generated/Strings.swift # Riot/Modules/Home/HomeViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m |
||
---|---|---|
.. | ||
Animators | ||
Assets/MatrixKitAssets.bundle | ||
Categories | ||
Controllers | ||
Libs/SwiftUTI | ||
Models | ||
Utils | ||
Views | ||
MatrixKit-Bridging-Header.h | ||
MatrixKit.h | ||
MatrixKitVersion.m |