Files
Mouaz b4ac387b67 Merge branch 'main' into gh-762/Uniform-tx-list--new-layout-+-reusable-view-controller
# 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
2020-12-21 17:40:02 +01:00
..
2020-12-21 16:18:38 +01:00