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
..
admin	Redesign admin instances area (#9645)	6 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	…
home_helper.rb	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add support for Malayalam in language filter (#9624)	6 years ago
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago