tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4c0770d6c8dac8177b8891a6fb97ccf440100fc2
Mastodon/Gemfile
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

3.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink