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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
8 years ago
..
environments
initializers Introduce OAuth scopes for bookmarks 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
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