Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upAdds alternate recipe to craft caltrops from wire or barbed wire. #4047
Conversation
Rivet-the-Zombie
added some commits
Nov 2, 2013
This comment has been minimized.
This comment has been minimized.
|
Tried merging, this blows up when it tries to load the JSON: |
This comment has been minimized.
This comment has been minimized.
|
Works fine now. Sorry about that! |
kevingranade
merged commit 86bd8e5
into
CleverRaven:master
Nov 3, 2013
1 check passed
default
Merged build finished.
Details
Rivet-the-Zombie
deleted the
Rivet-the-Zombie:Alternate-caltrops-recipe!
branch
Nov 3, 2013
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Rivet-the-Zombie commentedNov 2, 2013
No description provided.