mastodon/config
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	db/schema.rb
2018-01-09 14:16:45 -06:00
..
environments tighten csp 2018-01-06 18:49:03 +00:00
initializers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-09 14:16:45 -06:00
locales Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-09 14:16:45 -06:00
webpack Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-05 22:17:12 +00:00
application.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 04:17:11 +00:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb
routes.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-08 10:17:15 +00:00
secrets.yml
settings.yml Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
sidekiq.yml
webpacker.yml