diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
| commit | 9c0e7d91ec76c44ca63f87b2bcd46ff16cacc38b (patch) | |
| tree | 163b6c1eb5d9b97a8836f176e7d90f209458ce04 /Gemfile.lock | |
| parent | d75fe3934366ea5e2581df6111c6bccdb77d1e95 (diff) | |
| parent | aa8437947b28dda73bcfaf3caccb738e5e2f48b3 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fd03576..e0d013b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,7 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + daemons (1.1.9) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) delayed_job_active_record (4.0.0) @@ -131,6 +132,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) + daemons delayed_job_active_record httparty jbuilder (~> 1.2) |