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

2018-08-27 18:09:28 +02:00

..

components

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-27 18:09:28 +02:00

containers

Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)

2018-08-18 19:40:35 +02:00

util

Upgrade ESLint to version 4.x (#6276)

2018-01-17 16:57:15 +01:00

index.js

Add aria-label to column regions (#8390)

2018-08-23 17:26:21 +02:00