]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 6 Nov 2019 13:38:28 +0000 (14:38 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 6 Nov 2019 13:38:28 +0000 (14:38 +0100)
commit0ae7d8427394d5f98fb2bd78eaae9bf848831186
treee15a6321eedcbf9a2ae55ce24e7d8960f233b5ef
parent00793a86bc52e4cb37318e42ea4ceb37a896c727
parent42d9ca21de298e1d51b87723745f2b17e4169894
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`
13 files changed:
CONTRIBUTING.md
Gemfile
Gemfile.lock
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/packs/public.js
app/models/account.rb
app/models/media_attachment.rb
app/views/public_timelines/show.html.haml
config/locales/en.yml
db/schema.rb
package.json
yarn.lock