]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 11 Mar 2019 10:23:50 +0000 (11:23 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 11 Mar 2019 10:23:50 +0000 (11:23 +0100)
commit89bee860cdae399b796814f80a48eafa8b838d92
tree7f31aaa85f78b170f22cadd8c53fca8d09f8e795
parent3cef04610cd809c7bd01adc00d34fb3d25261a16
parent13a7f05030cdcbab24aeb25944a9a430238dbff1
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.
app/controllers/settings/exports_controller.rb
app/javascript/mastodon/locales/en.json
app/services/post_status_service.rb
streaming/index.js