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
..
chewy	…
controllers	Make storing and displaying application used to toot opt-in	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Make storing and displaying application used to toot opt-in	6 years ago
mailers	Improve e-mail digest (#9689)	6 years ago
models	Make storing and displaying application used to toot opt-in	6 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
serializers	Revert to storing application info, and display it to the author via API	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	Make storing and displaying application used to toot opt-in	6 years ago
workers	Fix multiple workers for the same scheduled status being queueable (#9875)	6 years ago