mirror of
https://github.com/luxfi/safe-ios.git
synced 2026-10-30 15:19:20 +00:00
# Conflicts: # Multisig.xcodeproj/project.pbxproj # Multisig/UI/App/UIKit/App/ViewControllerFactory.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/Cells/TransactionListHeaderTableViewCell.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/Cells/TransactionListHeaderTableViewCell.xib # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/Cells/TransactionListTableViewCell.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/Cells/TransactionListTableViewCell.xib # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/Cells/TransactionsListConflictHeaderTableViewCell.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/Cells/TransactionsListConflictHeaderTableViewCell.xib # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/FlatTransactionsListViewModel.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/HistoryTransactionsViewController.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/QueuedTransactionsViewController.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/TransactionListTableViewCell.swift # Multisig/UI/App/UIKit/Transaction/TransactionListViewController/TransactionListTableViewCell.xib