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 a8e43875a5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
v2	Add more granular OAuth scopes (#7929)	6 years ago
web	Lint pass (#8876)	6 years ago
base_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
oembed_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
proofs_controller_spec.rb	Fix base64-encoded file uploads not being possible (#12748)	5 years ago