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
..
admin	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	2019-02-18 14:59:19 +01:00
settings
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-13 14:41:06 +01:00
flashes_helper.rb
home_helper.rb	Make avatar and headers respect auto_play_gif (#9515)	2018-12-14 20:34:18 +01:00
instance_helper.rb
jsonld_helper.rb	Avoid redundant HTTP request on some error cases (#10115)	2019-02-25 15:54:17 +01:00
routing_helper.rb
settings_helper.rb	I18n: Add language options for Kazakh and Lithuanian (#10104)	2019-02-23 22:20:35 +01:00
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00