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

..

MasterTimelineAccessibilityCellLayout.swift

Continue adopting @MainActor.

2023-04-08 15:16:01 -07:00

MasterTimelineCellData.swift

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

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

MasterTimelineCellLayout.swift

Continue adopting MainActor.

2023-04-08 15:42:52 -07:00

MasterTimelineDefaultCellLayout.swift

Continue adopting MainActor.

2023-04-08 15:42:52 -07:00

MasterTimelineTableViewCell.swift

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

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

MasterUnreadIndicatorView.swift

Continue adopting MainActor.

2023-04-08 15:42:52 -07:00

MultilineUILabelSizer.swift

Continue adopting MainActor.

2023-04-08 15:42:52 -07:00

SingleLineUILabelSizer.swift

Continue adopting MainActor.

2023-04-08 15:42:52 -07:00