• Lukas Fülling's avatar
    Merge (and fix) branch 'master' of https://github.com/tootsuite/mastodon · 0669d604
    Lukas Fülling authored
     Conflicts:
    	app/javascript/mastodon/components/status_action_bar.js
    	app/javascript/mastodon/features/getting_started/index.js
    	app/javascript/mastodon/features/status/components/action_bar.js
    	app/javascript/mastodon/features/ui/index.js
    	app/models/account.rb
    	app/views/stream_entries/_simple_status.html.haml
    	config/locales/ast.yml
    	config/locales/devise.ru.yml
    	config/locales/devise.sk.yml
    	config/locales/he.yml
    	config/locales/id.yml
    	config/locales/io.yml
    	config/locales/te.yml
    	config/locales/th.yml
    	config/locales/tr.yml
    	lib/mastodon/version.rb
    	package.json
    	yarn.lock
    0669d604