tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3d033a468748338b6036cb24bb00ea4e88656ae6
Mastodon/app/javascript/mastodon/locales/ja.json
David Yip f4b2478af1 Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
2018-01-28 22:45:17 -06:00

17 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink