Files
Mastodon/config/locales/ko.yml
David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00

30 KiB