diff options
| author | rhenium <rhenium@rhe.jp> | 2015-03-27 01:04:07 +0900 |
|---|---|---|
| committer | rhenium <rhenium@rhe.jp> | 2015-03-27 01:04:07 +0900 |
| commit | e3d1ef82877f8bbeb6c2e9d6499fdd5ecbc40c94 (patch) | |
| tree | d19ba7ac711763dde770568bd5549cd49e44a2ba /Gemfile.lock | |
| parent | 9ae21946ced6a250cf09713e31203a415cf5dbde (diff) | |
| parent | 3d8037672f0a783d6e1bb138fdffb7884d35e3eb (diff) | |
| download | aclog-e3d1ef82877f8bbeb6c2e9d6499fdd5ecbc40c94.tar.gz | |
Merge branch 'master' into vuejs
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9eaf47d..6722116 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,6 +78,7 @@ GEM thor (~> 0.19.1) crack (0.4.2) safe_yaml (~> 1.0.0) + daemons (1.2.2) dalli (2.7.3) debug_inspector (0.0.2) descendants_tracker (0.0.4) @@ -304,6 +305,10 @@ GEM sprockets (>= 2.8, < 4.0) term-ansicolor (1.3.0) tins (~> 1.0) + thin (1.6.3) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0) + rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -389,6 +394,7 @@ DEPENDENCIES simplecov spring spring-commands-rspec + thin turbolinks twitter twitter-text |