mastodon/app
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
chewy
controllers
helpers
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
policies
presenters
serializers
services Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
validators
views
workers