You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
8 years ago
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
webpack Reduce assets precompilation time by about 20% 8 years ago
application.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml Ignore tootsuite-specific theme-related translation strings 8 years ago
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
sidekiq.yml
webpacker.yml