]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 3 Feb 2020 08:22:58 +0000 (09:22 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 3 Feb 2020 08:22:58 +0000 (09:22 +0100)
commit369201a425f7b539290815402a4bc65923911e11
tree45de36cd6aa8c22aaf4be6cefaeeb70218d4daf5
parent4cd2d13bd226c005317adf9848f4c0316401b2ff
parent3adc722d1cdd28d87d2724b8952d7ec52d241b52
Merge branch 'master' into glitch-soc/merge-upstream
Vagrantfile
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/views/statuses/_simple_status.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
lib/mastodon/version.rb