Merge branch 'master' into f13
Conflicts: .gitignore rubygem-json.spec
This commit is contained in:
commit
2d896e934d
1 changed files with 1 additions and 1 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1 +1 @@
|
|||
json-1.4.3.gem
|
||||
json-1.1.7.gem
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue