Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline

2019-10-10 17:26:08 +02:00

..

v1

Merge branch 'master' into glitch-soc/merge-upstream

2019-10-10 17:26:08 +02:00

v2

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

web

Fix web push notifications for polls (#10864)

2019-05-28 00:26:08 +02:00

base_controller.rb

Fix uncaught parameter missing exceptions and missing error templates (#11702)

2019-08-30 01:34:47 +02:00

oembed_controller.rb

Update status embeds (#4742)

2017-08-30 10:23:43 +02:00

proofs_controller.rb

Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00