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 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
environments Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
initializers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
webpack Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
application.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
boot.rb Lint pass (#8876) 7 years ago
brakeman.ignore Add animate custom emoji param to embed pages (#8507) 8 years ago
database.yml
deploy.rb Update dependencies for Ruby (2018-04-23) (#7237) 8 years ago
environment.rb
i18n-tasks.yml Ignore tootsuite-specific theme-related translation strings 8 years ago
navigation.rb Revert Font Awesome 5 upgrade (#8810) 8 years ago
puma.rb lint pass 2 (#8878) 7 years ago
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 Add nginx and systemd templates (#8770) 8 years ago
webpacker.yml Fix building assets in test environment 8 years ago