]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Fri, 18 Dec 2020 23:55:12 +0000 (00:55 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Fri, 18 Dec 2020 23:55:12 +0000 (00:55 +0100)
commitf9d000ebaec7732d5fcd46aa6685108a2619966b
tree9593841cf520b117ca4c3d5b68b19e9124c852da
parent92cfcf168cae094ece281b3cb6d0f5b1539a8c25
parentc6598b17d9212c2d48395da73fa9529025d704cc
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/views/admin/domain_blocks/edit.html.haml
app/views/admin/domain_blocks/new.html.haml
app/views/admin/settings/edit.html.haml
db/schema.rb
lib/mastodon/version.rb