Merge branch 'main' into ios-ui-settings-localised

# Conflicts:
#	NetNewsWire.xcodeproj/project.pbxproj
#	Shared/Timer/AccountRefreshTimer.swift
#	iOS/Account/ReaderAPIAccountViewController.swift
This commit is contained in:
Stuart Breckenridge
2023-02-09 10:05:18 +08:00
125 changed files with 995 additions and 2599 deletions

View File

@@ -25,10 +25,6 @@ extension UIStoryboard: Logging {
return UIStoryboard(name: "RedditAdd", bundle: nil)
}
static var twitterAdd: UIStoryboard {
return UIStoryboard(name: "TwitterAdd", bundle: nil)
}
static var settings: UIStoryboard {
return UIStoryboard(name: "Settings", bundle: nil)
}