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
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
application.rb
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
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
webpacker.yml