Phil Viso 1f8463d091 Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover ... # Conflicts: # iOS/Settings/AddLocalAccountViewController.swift # iOS/Settings/DetailAccountViewController.swift # iOS/Settings/Settings.storyboard		2019-05-19 19:03:50 -05:00
..
AboutViewController.swift	Update settings to begin to support multiple accounts	2019-05-16 15:48:55 -05:00
AddAccountViewController.swift	Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover	2019-05-19 19:03:50 -05:00
AddLocalAccountViewController.swift	Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover	2019-05-19 19:03:50 -05:00
DetailAccountViewController.swift	Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover	2019-05-19 19:03:50 -05:00
FeedbinAccountViewController.swift	Add Feedbin account and delete account functionality added to iOS	2019-05-19 18:04:32 -05:00
RefreshIntervalViewController.swift	Made number of lines in timeline configurable.	2019-04-29 15:29:00 -05:00
Settings.storyboard	Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover	2019-05-19 19:03:50 -05:00
SettingsTableViewCell.xib	Update settings to begin to support multiple accounts	2019-05-16 15:48:55 -05:00
SettingsViewController.swift	Moved Add NetNewsWire feed to about section, and hide it if they don’t have any active feeds	2019-05-19 18:35:45 -05:00
TimelineNumberOfLinesViewController.swift	Made number of lines in timeline configurable.	2019-04-29 15:29:00 -05:00