aboutsummaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorParker Moore <parkrmoore@gmail.com>2013-02-28 12:55:13 -0800
committerParker Moore <parkrmoore@gmail.com>2013-02-28 12:55:13 -0800
commitf4f42823f687e840c65fdeab0c35d26d442835f7 (patch)
tree068cc6cc4593982ab9020103ee06a7902c6bcc0d /Gemfile.lock
parent4790b939807be4d9abcc567f02773ff24b99320d (diff)
parent960145fa20533174ecd6a6306cf1f235e82650eb (diff)
downloadmy_new_personal_website-f4f42823f687e840c65fdeab0c35d26d442835f7.tar.xz
my_new_personal_website-f4f42823f687e840c65fdeab0c35d26d442835f7.zip
Merge pull request #1074 from joneslee85/bump-sinatra
Bump sinatra to 1.3.5
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c235b2cb..d5bc6224 100644
--- a/Gemfile.lock
+++ b/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)