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.

imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		7 years ago
..
environments	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
initializers	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
locales	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
webpack	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
application.rb	Merge branch 'master' of https://github.com/tootsuite/mastodon	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	…
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	…