Merge pull request #1074 from joneslee85/bump-sinatra

Bump sinatra to 1.3.5
heygrady · Feb 28, 2013 · f4f4282 · f4f4282
2 parents 4790b93 + 960145f
commit f4f4282
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -15,4 +15,4 @@ group :development do
   gem 'liquid', '~> 2.3.0'
 end
 
-gem 'sinatra', '~> 1.3.3'
+gem 'sinatra', '~> 1.3.5'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,17 +28,17 @@ GEM
     pygments.rb (0.3.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-protection (1.3.2)
       rack
     rake (0.9.2.2)
     rb-fsevent (0.9.1)
     rdiscount (1.6.8)
     rubypants (0.2.0)
     sass (3.1.20)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     stringex (1.4.0)
     syntax (1.0.0)
@@ -60,5 +60,5 @@ DEPENDENCIES
   rb-fsevent (~> 0.9)
   rdiscount (~> 1.6.8)
   rubypants (~> 0.2.0)
-  sinatra (~> 1.3.3)
+  sinatra (~> 1.3.5)
   stringex (~> 1.4.0)