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.		2019-02-26 17:04:44 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00
v2	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
web	Sanitize and sandbox toot embeds (#9552)	2018-12-23 02:16:35 +01:00
base_controller.rb	Add error message with invalid email confirmation (#9625)	2018-12-25 19:35:26 +01:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb