Skip to content

A
annotate
Commit 61b2574d by Jon Frisby
Options

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

Conflicts: .gitignore
parents 18da6a78 5a71edf9
develop … v3.2.0 v3.1.1 v3.1.1-release v3.1.0 v3.0.3 v3.0.2 v3.0.0 v2.7.5 v2.7.4 v2.7.3 v2.7.2 v2.7.1 v2.7.0 v2.6.10 v2.6.9 v2.6.8 v2.6.7 v2.6.6 v2.6.5 v2.6.4 v2.6.3 v2.6.2 v2.6.0 v2.5.0 release/v3.0.1
No related merge requests found
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