about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-16 21:52:38 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-16 21:52:38 +0200
commit78ac246b877072bb5f94da34d29612fafde3a8ae (patch)
treee1b781fe4fae9d02284e5e836338cc598431413f /docs
parent80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff)
parent6bed372ad2d8da87f0f3cfa478e688c48aa94702 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions