Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system

2019-05-10 17:09:12 +02:00

1.0 KiB

Raw Blame History

View Raw