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 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c9. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.		6 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
v2	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
web	Sanitize and sandbox toot embeds (#9552)	6 years ago
base_controller.rb	Add error message with invalid email confirmation (#9625)	6 years ago
oembed_controller.rb	…
push_controller.rb	…
salmon_controller.rb	…
subscriptions_controller.rb	…