Merge branch 'master' into google_reader_compatible_syncing

Browse Source

# Conflicts:
#	Frameworks/Account/Account.swift
#	submodules/RSWeb

...

This commit is contained in:

Jeremy Beker

2019-06-15 12:34:50 -04:00

parent e5eb8df333 ce703fd947

commit f54bc3569b

79 changed files with 1352 additions and 510 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/RSCore

Submodule submodules/RSCore updated: 97dc785d17...aa7107080e

2

submodules/RSDatabase

Submodule submodules/RSDatabase updated: c38a779de5...7b44768308

2

submodules/RSParser

Submodule submodules/RSParser updated: 93b481897d...032edf89b6

2

submodules/RSTree

Submodule submodules/RSTree updated: b6cd62f04c...3507621044