You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec
Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
7 years ago
..
controllers Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 7 years ago
fabricators Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
features
fixtures Export and import show_reblogs together with following list (#10495) 7 years ago
helpers
lib Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mailers Add invite request to pending account notification e-mail (#10528) 7 years ago
models Update remote bio test from 160 to 500 (#10799) 7 years ago
policies
presenters
requests
routing
serializers/activitypub
services Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 7 years ago
support
validators Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
views
workers
rails_helper.rb
spec_helper.rb