You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
initializers	Introduce OAuth scopes for bookmarks	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	Reduce assets precompilation time by about 20%	6 years ago
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
database.yml	…
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
environment.rb	…
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	7 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sidekiq.yml	Account archive download (#6460)	7 years ago
webpacker.yml	…