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

..

project.xcworkspace

Update to the latest RSCore

2022-11-12 17:32:21 -06:00

xcshareddata/xcschemes

Merge mac-release

2023-02-08 16:37:29 -08:00

project.pbxproj

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

2023-05-27 17:00:42 +08:00