1a60301a17
Conflicts: app/assets/javascripts/discourse/controllers/composer_controller.js app/assets/javascripts/discourse/views/composer_view.js config/locales/client.en.yml