]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 1 Jul 2020 17:23:14 +0000 (19:23 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 1 Jul 2020 17:23:14 +0000 (19:23 +0200)
commit45deca65b3fb8e9f19818e3db7d315cab0572d1a
tree1b9bab6ec764e8a6600d245595facd5694287e16
parent39a0622de70dc24275808cee9526658bd68a55ed
parent6d23d40420e4548778f3ca4ed9e8cb16e0eb0073
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.
Gemfile.lock
app/javascript/core/settings.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/components.scss
app/lib/feed_manager.rb
config/i18n-tasks.yml