diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-06 21:16:24 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-06 21:16:24 -0400 |
| commit | 0afd45939facfc9bdbc7481e649af0ab89b7b029 (patch) | |
| tree | 435229467dd4adfd0612d081cce8ef75b6a4644b /Gemfile.lock | |
| parent | 0f982ba511d4f38322f69a6aaed768181b4e2852 (diff) | |
| parent | f06e7769ec201f17adc87251da63075a86ce1a94 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/matches.css.scss
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 51e29e7..fd03576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,9 @@ GEM coffee-script-source (1.7.0) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) + delayed_job_active_record (4.0.0) + activerecord (>= 3.0, < 4.1) + delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -128,7 +131,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails |