mastodon/config
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
environments
initializers
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb
routes.rb
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
sidekiq.yml
webpacker.yml