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 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb		6 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	…
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	…
brakeman.ignore	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	6 years ago
deploy.rb	Use the bundled Capistrano version (#9855)	6 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Enable "displaying application used to post" setting by default (#9994)	6 years ago
sidekiq.yml	…
webpacker.yml	…