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 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		7 years ago
..
environments	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
initializers	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
locales	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
webpack	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
application.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
boot.rb	…
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
navigation.rb	Moved flavour UI into own prefs tab	7 years ago
puma.rb	…
routes.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
secrets.yml	…
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
sidekiq.yml	Account archive download (#6460)	7 years ago
webpacker.yml	Finalized theme loading and stuff	7 years ago