You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	…
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	…
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	…
routing	…
serializers/activitypub	…
services	…
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago