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

..

action_bar.js

…

autosuggest_account.js

…

character_counter.js

…

compose_form.js

…

emoji_picker_dropdown.js

…

navigation_bar.js

…

privacy_dropdown.js

…

reply_indicator.js

…

search_results.js

…

search.js

…

text_icon_button.js

…

upload_button.js

…

upload_form.js

…

upload_progress.js

…

upload.js

…

warning.js

…