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		2019-03-13 15:16:02 +01:00
..
environments
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-15 18:02:45 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
webpack
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00
boot.rb
brakeman.ignore	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	2019-03-08 14:36:28 +01:00
deploy.rb	Use the bundled Capistrano version (#9855)	2019-01-18 21:31:11 +01:00
environment.rb
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
secrets.yml
settings.yml	Enable "displaying application used to post" setting by default (#9994)	2019-02-09 17:33:41 +01:00
sidekiq.yml
webpacker.yml