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

Commit

Permalink
Merge pull request #59 from pazjacket/tachikoma/update-20151013164353
Browse files Browse the repository at this point in the history
Exec tachikoma update 20151013164353
  • Loading branch information
tyabe committed Oct 18, 2015
2 parents a59fa36 + b51e213 commit e880219
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ GEM
bcrypt (3.1.10)
builder (3.2.2)
coderay (1.1.0)
coveralls (0.8.2)
coveralls (0.8.3)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.10.0)
Expand All @@ -27,7 +27,7 @@ GEM
database_cleaner (1.0.1)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.24)
domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0)
foreman (0.78.0)
thor (~> 0.19.1)
Expand All @@ -46,7 +46,7 @@ GEM
mime-types (1.25.1)
mini_record (0.4.6)
activerecord (>= 3.2.0)
minitest (5.8.0)
minitest (5.8.1)
moneta (0.7.20)
multi_json (1.11.2)
netrc (0.10.3)
Expand Down Expand Up @@ -84,19 +84,20 @@ GEM
padrino-core (= 0.12.4)
padrino-support (0.12.4)
activesupport (>= 3.1)
pg (0.18.2)
pg (0.18.3)
polyglot (0.3.5)
pry (0.10.1)
pry (0.10.2)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-padrino (0.1.2)
pry (>= 0.8)
puma (2.13.4)
pusher (0.14.5)
puma (2.14.0)
pusher (0.14.6)
httpclient (~> 2.5)
multi_json (~> 1.0)
signature (~> 0.1.8)
pusher-signature (~> 0.1.8)
pusher-signature (0.1.8)
rack (1.6.4)
rack-protection (1.5.3)
rack
Expand All @@ -120,9 +121,8 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
sass (3.4.18)
sass (3.4.19)
settingslogic (2.0.9)
signature (0.1.8)
simplecov (0.10.0)
docile (~> 1.1.0)
json (~> 1.8)
Expand All @@ -136,7 +136,7 @@ GEM
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
sqlite3 (1.3.10)
sqlite3 (1.3.11)
temple (0.7.6)
term-ansicolor (1.3.2)
tins (~> 1.0)
Expand Down

0 comments on commit e880219

Please sign in to comment.