Skip to content

Commit

Permalink
Merge pull request #58 from pikesley/deps
Browse files Browse the repository at this point in the history
Bump deps
  • Loading branch information
Sam Pikesley committed Jun 4, 2014
2 parents 7e51b54 + f6bcd6a commit 18ed2ff
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ GEM
i18n (0.6.9)
json (1.8.1)
kramdown (1.3.3)
listen (2.7.5)
listen (2.7.6)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.5)
lumberjack (1.0.6)
method_source (0.8.2)
mime-types (2.3)
mini_portile (0.6.0)
Expand Down Expand Up @@ -109,14 +109,18 @@ GEM
rest-client (>= 1.6.1)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.0)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
Expand All @@ -139,11 +143,11 @@ GEM
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.3)
thread_safe (0.3.4)
tilt (1.4.1)
timers (1.1.0)
tins (1.3.0)
tzinfo (1.1.0)
tzinfo (1.2.1)
thread_safe (~> 0.1)
xpath (2.0.0)
nokogiri (~> 1.3)
Expand Down

0 comments on commit 18ed2ff

Please sign in to comment.