]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 27 Jan 2020 14:46:50 +0000 (15:46 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 27 Jan 2020 14:46:50 +0000 (15:46 +0100)
commitc56a504d116d62fe669d15a270133d7c78dd61f1
tree7400f3182f2a4ebd1606c37a1a5cad4cc95e443b
parent8924743349ec5ce37cd949445e071c14968ec2ec
parentc2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
Gemfile
Gemfile.lock
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
app/lib/feed_manager.rb
app/serializers/rest/account_serializer.rb
app/views/directories/index.html.haml
config/locales/en.yml
config/routes.rb
db/schema.rb