mastodon/config
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb
2018-02-04 16:36:19 -06:00
..
environments change referrer policy to same-origin 2018-02-03 14:49:00 -05:00
initializers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
locales Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
webpack Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06:00
application.rb Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 2018-01-21 16:26:50 -06:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
navigation.rb Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
puma.rb
routes.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
secrets.yml
settings.yml Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
sidekiq.yml Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) 2018-01-15 04:34:28 +01:00
webpacker.yml