Phil Viso 8a6e3c9f37 Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into GroupArticlesByFeed ... # Conflicts: # Mac/MainWindow/Timeline/TimelineViewController.swift		2019-09-13 08:23:31 -05:00
..
AddFeedFromListSheet.xib	Major folder and project tree restructuring.	2019-04-13 16:18:54 -07:00
AddFeedSheet.xib	Major folder and project tree restructuring.	2019-04-13 16:18:54 -07:00
AddFolderSheet.xib	Major folder and project tree restructuring.	2019-04-13 16:18:54 -07:00
Main.storyboard	Renamed Sort By menu item to Sort Articles By	2019-09-08 17:12:18 -05:00
MainWindow.storyboard	Add accessibility labels to Sidebar, Timeline, and Article. Issue #934	2019-09-10 11:09:17 -05:00
Preferences.storyboard	Add checkbox to Preferences > General for turning off the unread count in the Dock.	2019-09-03 22:17:31 -07:00
RenameSheet.xib	Major folder and project tree restructuring.	2019-04-13 16:18:54 -07:00