Skip to content

Commit

Permalink
Merge pull request #92 from pazjacket/tachikoma/update-20151227135311
Browse files Browse the repository at this point in the history
Exec tachikoma update 20151227135311
  • Loading branch information
kei-s committed Dec 28, 2015
2 parents 9b9b883 + c891320 commit 7de19da
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ GEM
tilt
htmlentities (4.3.4)
json (1.8.3)
mime-types (2.6.2)
mini_portile (0.6.2)
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2015.1120)
mini_portile2 (2.0.0)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2)
org-ruby (0.9.12)
rubypants (~> 0.2)
poltergeist (1.8.0)
poltergeist (1.8.1)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
Expand All @@ -42,22 +44,22 @@ GEM
rack (>= 1.0)
rake (10.4.2)
rdoc (3.6.1)
redcarpet (3.3.3)
redcarpet (3.3.4)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.0)
rspec-support (3.4.1)
rubypants (0.2.0)
simplecov (0.10.0)
simplecov (0.11.1)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
Expand Down

0 comments on commit 7de19da

Please sign in to comment.