• 住民税's avatar
    Merge tag 'v1.4.1' into bump-version-to-v1.4.1 · 35880041
    住民税 authored
    Conflicts:
    	.gitignore
    	Gemfile
    	Gemfile.lock
    	app/javascript/mastodon/locales/ja.json
    	app/services/concerns/author_extractor.rb
    	app/services/process_feed_service.rb
    	app/services/subscribe_service.rb
    	app/workers/pubsubhubbub/confirmation_worker.rb
    	app/workers/pubsubhubbub/delivery_worker.rb
    	config/sidekiq.yml
    	lib/mastodon/version.rb
    	spec/services/subscribe_service_spec.rb
    35880041