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.

David Yip 16d5217502 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json		7 years ago
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
initializers	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
locales	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
webpack	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
application.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
brakeman.ignore	…
database.yml	…
deploy.rb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
puma.rb	…
routes.rb	Direct messages column (#4514)	7 years ago
secrets.yml	…
settings.yml	…
sidekiq.yml	…
webpacker.yml	…