Commit Graph

4 Commits

Author SHA1 Message Date
Stuart Breckenridge
ed6ff090be Merge branch 'ios-ui-settings-localised' into localize_strings
# Conflicts:
#	Mac/AppDelegate.swift
#	Mac/Base.lproj/Preferences.storyboard
#	NetNewsWire.xcodeproj/project.pbxproj
#	Shared/Localizations/LocalizedNetNewsWireError.swift
#	iOS/MasterFeed/MasterFeedViewController.swift
#	iOS/Settings/Appearance/ArticleThemeManagerView.swift
#	iOS/Settings/Appearance/DisplayAndBehaviorsView.swift
#	iOS/Settings/General/SettingsView.swift
2023-05-27 17:00:42 +08:00
Brent Simmons
402c5e7bbb Continue adopting @MainActor. 2023-04-05 09:24:43 -07:00
Stuart Breckenridge
e670d610e3 Localized mac app 2023-01-04 12:33:38 +08:00
Brent Simmons
70312aa75c Major folder and project tree restructuring. 2019-04-13 16:18:54 -07:00