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	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	6 years ago
brakeman.ignore	Allow joining several hashtags in a single column (#8904)	6 years ago
database.yml	Remove PostgreSQL statement timeout (#9537)	6 years ago
deploy.rb	Use the bundled Capistrano version (#9855)	6 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
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	Improve ActiveRecord connection in on_worker_boot (#9238)	6 years ago
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	Fix building assets in test environment	6 years ago