Merge branch 'master' into feature/feed-wrangler

Browse Source

# 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

parent 82d7631694 6d407a0f3a

commit b4a862d207

355 changed files with 89315 additions and 5653 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

submodules/RSWeb

Submodule submodules/RSWeb updated: 1ea5f5ccfc...b2ef3e1113