This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec
Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
2020-07-22 13:38:17 +02:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
fabricators
features
fixtures
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00
mailers
models
policies
presenters
requests
routing
serializers/activitypub
services Merge branch 'master' into glitch-soc/merge-upstream 2020-07-16 14:43:50 +02:00
support
validators
views
workers
rails_helper.rb
spec_helper.rb