Skip to content
This repository has been archived by the owner on Apr 9, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into develop-merge-master-20170627
Browse files Browse the repository at this point in the history
  • Loading branch information
dazza-codes committed Jun 27, 2017
2 parents 8206527 + 2383663 commit 4b00871
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Gemfile.lock
Expand Up @@ -108,12 +108,12 @@ GEM
pry-doc (0.10.0)
pry (~> 0.9)
yard (~> 0.9)
rack (1.6.4)
rack (1.6.8)
rack-protection (1.5.3)
rack
rake (10.5.0)
redis (3.3.3)
redis-namespace (1.5.2)
redis-namespace (1.5.3)
redis (~> 3.0, >= 3.0.4)
resque (1.25.2)
mono_logger (~> 1.0)
Expand Down Expand Up @@ -153,8 +153,8 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
sinatra (1.4.6)
rack (~> 1.4)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
slop (3.6.0)
Expand All @@ -169,7 +169,7 @@ GEM
tins (~> 1.0)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.1)
tilt (2.0.7)
tins (1.14.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
Expand Down

0 comments on commit 4b00871

Please sign in to comment.