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 e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes		6 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application.rb	…
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	Use the bundled Capistrano version (#9855)	6 years ago
environment.rb	…
i18n-tasks.yml	…
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	Make storing and displaying application used to toot opt-in	6 years ago
sidekiq.yml	Add scheduled statuses (#9706)	6 years ago
webpacker.yml	…