Merge branch 'pr-106'

This commit is contained in:
cktricky
2014-04-17 08:15:31 -04:00
+3 -3
View File
@@ -102,7 +102,7 @@ GEM
dotenv (>= 0.7) dotenv (>= 0.7)
thor (>= 0.13.6) thor (>= 0.13.6)
formatador (0.2.4) formatador (0.2.4)
gauntlt (1.0.8) gauntlt (1.0.9)
aruba (= 0.5.4) aruba (= 0.5.4)
cucumber (= 1.3.11) cucumber (= 1.3.11)
nokogiri (= 1.6.1) nokogiri (= 1.6.1)
@@ -190,7 +190,7 @@ GEM
rack (>= 0.4) rack (>= 0.4)
rack-livereload (0.3.15) rack-livereload (0.3.15)
rack rack
rack-protection (1.5.2) rack-protection (1.5.3)
rack rack
rack-ssl (1.3.4) rack-ssl (1.3.4)
rack rack
@@ -252,7 +252,7 @@ GEM
multi_json multi_json
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
sinatra (1.4.4) sinatra (1.4.5)
rack (~> 1.4) rack (~> 1.4)
rack-protection (~> 1.4) rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4) tilt (~> 1.3, >= 1.3.4)