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 e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		4 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
v2	…
web	…
base_controller.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
oembed_controller.rb	…
proofs_controller.rb	…