diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-03 16:25:14 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-03 16:25:14 -0400 |
| commit | 9236bc8f79bf18f7aa9802090c53536fe20108bb (patch) | |
| tree | 92cb8a4f73ebb074ca00e0b14af13486d4763c68 /Gemfile.lock | |
| parent | b62c07359a9cbc7bad93c375c50d266a40dfe539 (diff) | |
| parent | 5169363d6698fb87372efcb7ace552b89953584e (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7899a93..83f5525 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,8 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + delayed_job (4.0.0) + activesupport (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -119,6 +121,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) + delayed_job jbuilder (~> 1.2) jquery-rails rails (= 4.0.2) |