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 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		6 years ago
..
components	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers	Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)	6 years ago
util	Upgrade ESLint to version 4.x (#6276)	7 years ago
index.js	Add aria-label to column regions (#8390)	6 years ago