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
..
admin	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	6 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	…
home_helper.rb	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	Avoid redundant HTTP request on some error cases (#10115)	6 years ago
routing_helper.rb	…
settings_helper.rb	I18n: Add language options for Kazakh and Lithuanian (#10104)	6 years ago
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago