Skip to content
Browse files

Merge pull request #1074 from joneslee85/bump-sinatra

Bump sinatra to 1.3.5
  • Loading branch information...
2 parents 4790b93 + 960145f commit f4f42823f687e840c65fdeab0c35d26d442835f7 @parkr parkr committed
Showing with 6 additions and 6 deletions.
  1. +1 −1 Gemfile
  2. +5 −5 Gemfile.lock
View
2 Gemfile
@@ -15,4 +15,4 @@ group :development do
gem 'liquid', '~> 2.3.0'
end
-gem 'sinatra', '~> 1.3.3'
+gem 'sinatra', '~> 1.3.5'
View
10 Gemfile.lock
@@ -28,7 +28,7 @@ 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)
@@ -36,9 +36,9 @@ GEM
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)

0 comments on commit f4f4282

Please sign in to comment.
Something went wrong with that request. Please try again.