* django1.11: (152 commits)
request.raw_post_data -> request.body (django 1.6)
Upgrading pgbouncer to 1.15.0.
Finishing off Postgresql 13 upgrade.
Upgrading to Postgresql 13.
Ubuntu 20.04
Fixing supervisor path issues
Upgrading setuptools
Fixing flask
Handling over capacity for twitter.
Max length for image_urls.
Properly filtering newsletter feeds.
Fixing issue with text importer on feed-less urls.
Removing dependency, fixing encoding issue for pages.
Fixing DB Monitor.
Updating User Agent for all fetchers.
Ignoring VSCode.
Fixing DB Monitor.
Updating User Agent for all fetchers.
Ignoring VSCode.
Fixing Statistics by fixing how timezones are handled.
...
* master: (59 commits)
Handling twitter posting error.
Fixing bug where closed story would show inline detail when switching b/w Text and Feed view.
Temporarily locked = suspended on twitter.
Adjusting flashing loading indicator to be less conspicuous.
Handling validation of emails on api.
Handling lxml parser errors for original text.
Adding exception handling for twitter feeds.
Switch to filter instead of opacity
iOS: fixed#924 (losing story on lock)
iOS: white flash fix
iOS v6.0.3.
Handling deletion of feeds in folders where the parent folder has hypens (which are stripped on iOS/mobile to handle flat).
iOS: Fixed unread count issue when offline
Fixing twitter status permalink.
Handling YouTube playlists.
Android v4.9.0.
iOS: Eliminate duplicate URLs when sharing to Twitter, Facebook, Weibo and OmniFocus.
Clean up activity handling, and fix sending to Reading List.
Update Dockerfile
Upgrading tweepy, hoping it fixes auth issues w/ twitter.
...
