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
..
accounts_cli.rb	Fix `tootctl accounts delete` not deleting user record as well (#9874)	2019-01-20 12:30:25 +01:00
cli_helper.rb	…
domains_cli.rb	Fix `tootctl domains crawl` with JSON format output crash (#9820)	2019-01-16 15:47:55 +01:00
emoji_cli.rb	…
feeds_cli.rb	…
media_cli.rb	…
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	2019-01-27 23:56:07 +01:00
premailer_webpack_strategy.rb	…
redis_config.rb	…
settings_cli.rb	…
snowflake.rb	…
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00