Conflicts:
	README.md
	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/status/components/detailed_status.js
	app/javascript/mastodon/features/ui/index.js
	app/lib/activitypub/activity.rb
	app/lib/activitypub/activity/announce.rb
	app/lib/activitypub/activity/create.rb
	config/locales/en.yml
	config/locales/simple_form.de.yml
	config/settings.yml
	package.json
	spec/lib/activitypub/activity/announce_spec.rb
	yarn.lock