Jeremy Beker 97585326c8

Merge branch 'master' into google_reader_compatible_syncing ...

# Conflicts:
#	iOS/Settings/SettingsAddAccountView.swift

2019-06-18 15:38:59 -04:00

..

Account

FIrst pass at OPML import. Broken.

2019-06-16 15:14:20 -04:00

Articles

Only display active accounts for OPML import on iOS

2019-06-17 15:50:17 -05:00

ArticlesDatabase

Fix crashing bug caused by nesting update statements.

2019-05-21 17:59:33 -05:00

SyncDatabase

Change so that we fire off status update immediately if the number of pending status changes exceeds 100. Issue #658

2019-05-27 12:03:12 -05:00

Vendor/Sparkle.framework

Add Sparkle. Update SUFeedURL to use https, since I just added https to ranchero.com. (Thanks to Let’s Encrypt!).

2017-05-29 15:44:33 -07:00