]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 3 Nov 2020 16:28:54 +0000 (17:28 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 3 Nov 2020 16:28:54 +0000 (17:28 +0100)
commitcd675fbe18bbd9e8c6c0fe9ffb6b3037282cd6c9
tree763163999f72fccbd0440f57d50cf3dca248422c
parentb8e790c3c22693271a4fd74ce34067c462ebf8a3
parentf645dad661ba033efdcdd6ca7597e7b8bc7f4f51
Merge branch 'master' into glitch-soc/merge-upstream
Gemfile.lock
app/controllers/filters_controller.rb
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/views/statuses/_simple_status.html.haml
package.json
yarn.lock