* master:
Android v4.7.0.
iOS: Work around iOS 9 issue where training menu doesn’t appear the first time you select text.
Adding logrotate for nginx.
Premium accounts get feeds fetched at least once every 12 hours (for feeds that publish nothing).
Flat feeds also gets user_id.
Adding user_id to /reader/feeds.
Boosting oauth authorization code expiration to 1 hour (from 60 seconds) to aid development.
Adding MX DNS check on new users.
Fixing valuerror when trimming on feeds that have bogus dates.
Change find-next-unread to search forward then backward rather than forward in a loop.
Counting shared stories when deleting old feeds.
Updating story trimmer to look for unread feeds that may be actively subscribed.
Rotating feed stats hours based on user's timezone preference.
* master: (138 commits)
Android v4.7.0b2.
Adding search query to query string on web.
Tweak story search menu item to properly toggle.
Allow story search icon to appear as icon in actionbar where able.
Fixing redirect behavior by saving redirect history for 25 fetches when one 400+ error is found.
Fixing tag stripping in content previews.
Why check if feed pane size is too small and force a resize?
Moving show hidden stories to story titles header. Folder keeps its own, feeds use story titles.
24 hour max for premiums, 48 hour max for free
Testing out faster feed updates for premiums.
Better handling youtube feed errors.
Fixing token errors on searches.
Handling issue where counting premiums is not being saved due to db issue.
.tm_properties
Fixing a longstanding bug in the exception changer dialog. Now correctly finding branch feed.
Factor out ugle custom serialisation in prep for Saved story tag reading.
Re-enable unread prefetching for non-premium accounts.
Update Dockerfile
Cleaning up story list view.
Fixing switching layouts b/w starred stories and read stories on web. Also fixing premium explainer on both when in Full view.
...
