Merge

tevio · Sep 25, 2011 · 953cb0b · 953cb0b
2 parents b2dfcbd + 695bfac
commit 953cb0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@ doc
 tmp
 coverage
 .bundle
+.rvmrc
 .yardoc/
 .rvmrc
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
       bson (>= 1.3.1)
     mongoid (2.2.1)
       activemodel (~> 3.0)
-      mongo (>= 1.3, < 1.4)
+      mongo (< 1.4, >= 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.3)
     nokogiri (1.5.0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ doc @@
     tmp
     coverage
     .bundle
+    .rvmrc
     .yardoc/
     .rvmrc