]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 13 Mar 2019 14:16:02 +0000 (15:16 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 13 Mar 2019 14:16:02 +0000 (15:16 +0100)
commit02062aab55cb6f8da527998a210775c2ad695eed
treeab606ee84d964f28dad5bc77cfbd49b5c12849fa
parentc2857c976c7d4a8bbd02c3c18569913f2bf8a034
parent06663fcf87fe0d6bc71336e6f212b82f098066d7
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
20 files changed:
Gemfile.lock
app/controllers/about_controller.rb
app/controllers/accounts_controller.rb
app/controllers/tags_controller.rb
app/models/account.rb
app/presenters/instance_presenter.rb
app/services/remove_status_service.rb
app/views/layouts/public.html.haml
app/views/tags/show.html.haml
app/workers/activitypub/distribute_poll_update_worker.rb
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/ja.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/routes.rb
spec/models/account_spec.rb
spec/views/about/show.html.haml_spec.rb