mirror of
https://github.com/Ranchero-Software/NetNewsWire
synced 2025-08-12 06:26:36 +00:00
Merge branch 'main' into localize_strings
# Conflicts: # Mac/MainWindow/AddFeed/AddTwitterFeedWindowController.swift # Mac/MainWindow/MainWindowController.swift # NetNewsWire.xcodeproj/project.pbxproj # Shared/ArticleStyles/ArticleTheme.swift # iOS/Add/AddFeedViewController.swift # iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift # iOS/Article/ArticleViewController.swift # iOS/MasterFeed/MasterFeedViewController.swift
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user