Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +02:00
..
environments	Move CSP headers to the appropriate Rails configuration	2018-08-22 20:39:33 +02:00
initializers	Only apply CSP in production mode	2018-08-23 22:58:40 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
webpack	Reduce assets precompilation time by about 20%	2018-07-28 23:24:41 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
boot.rb
brakeman.ignore	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-17 22:05:25 +02:00
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02:00
sidekiq.yml
webpacker.yml