tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
5d823ee00a5c4e06aec457783499ce0f82558bed
Mastodon/app/javascript/mastodon/locales/ja.json
Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00

19 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink