Merge branch 'master' into feature/feed-wrangler

# Conflicts:
#	Frameworks/Account/Account.swift
#	Frameworks/Account/Account.xcodeproj/project.pbxproj
#	NetNewsWire.xcodeproj/project.pbxproj
#	submodules/RSCore
This commit is contained in:
Jonathan Bennett
2019-11-20 14:01:04 -05:00
355 changed files with 89315 additions and 5653 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -28,16 +28,6 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "849C64701ED37A5D003D8FC0"
BuildableName = "NetNewsWireTests.xctest"
BlueprintName = "NetNewsWireTests"
ReferencedContainer = "container:NetNewsWire.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference