]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 7 Jun 2019 15:00:36 +0000 (17:00 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 7 Jun 2019 15:00:36 +0000 (17:00 +0200)
commit34b8346e7f1274d40734f9da3100a4343cf9f81c
tree1a851db65a949df937de0a3eb4fce1e9f83e5301
parent83600198961cce9bfe82cf0f0c33286703bc86d1
parenta60364ca7d26c82c9353980d0966d37e9aa66014
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
19 files changed:
Gemfile
Gemfile.lock
app/controllers/accounts_controller.rb
app/controllers/application_controller.rb
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/statuses_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/status.rb
app/services/process_mentions_service.rb
app/services/reblog_service.rb
app/services/remove_status_service.rb
app/workers/activitypub/distribute_poll_update_worker.rb
config/locales/en.yml
package.json