tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
This commit is contained in:
David Yip
2018-01-19 15:22:10 -06:00
parent 2b2de41bc7 0b888acfd4
commit 2ca965c704
90 changed files with 375 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/ko.yml
View File

@ -340,7 +340,6 @@ ko:
application_mailer:
notification_preferences: 메일 설정 변경
settings: '메일 설정을 변경: %{link}'
signature: Mastodon %{instance} 인스턴스로에서 알림
view: 'View:'
view_profile: 프로필 보기
view_status: 게시물 보기