tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
81e3ec4d6128ad36c54d265c976727abf944e821
Mastodon/app/javascript/mastodon/locales/en.json
T
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

16 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink