Jeremy Beker 97585326c8 Merge branch 'master' into google_reader_compatible_syncing ...

# Conflicts:
#	iOS/Settings/SettingsAddAccountView.swift

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

..

UIKit

Wiring up iOS add account settings

2019-06-16 18:22:00 -04:00

SettingsAccountLabelView.swift

Convert Settings to use SwiftUI

2019-06-11 16:59:16 -05:00

SettingsAddAccountView.swift

Update to work with the latest SwiftUI API's

2019-06-17 17:48:32 -05:00

SettingsDetailAccountView.swift

Port Feedbin credential update too SwfitUI.

2019-06-15 16:03:41 -05:00

SettingsFeedbinAccountView.swift

Wiring up iOS add account settings

2019-06-16 18:22:00 -04:00

SettingsGoogleReaderCompatibleAccountView.swift

Use proper google credential.

2019-06-18 15:37:39 -04:00

SettingsLocalAccountView.swift

Add Import/Export OPML action sheet.

2019-06-15 18:19:20 -05:00

SettingsSubscriptionsExportDocumentPickerView.swift

Add OPML Export for SwiftUI

2019-06-16 11:19:15 -05:00

SettingsSubscriptionsImportDocumentPickerView.swift

Add OPML Export for SwiftUI

2019-06-16 11:19:15 -05:00

SettingsView.swift

Merge remote-tracking branch 'refs/remotes/origin/master'

2019-06-17 17:49:41 -05:00