Skip to content

A
annotate
Commit 61b2574d by Jon Frisby
Options

Merge remote-tracking branch 'amalc/master' into development

Conflicts: .gitignore
parents 18da6a78 5a71edf9
Showing with 1 addition and 0 deletions
.gitignore
......@@ -5,3 +5,4 @@ coverage/*
spec/debug.log
pkg/*
*.gem
/.idea/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment