diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 01:12:36 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 01:12:36 -0400 |
| commit | ab3eaa120d11f04721fbe7d670e024358d3c46b0 (patch) | |
| tree | 55042be19773106f9b62a5181c621bbfca695565 /Gemfile.lock | |
| parent | 5d9cb2ec8a1edcdea4a1fa91c688ede16ed03845 (diff) | |
| parent | 1fcac4a83e838ef5b94ffb899ea6b4c5fd1984de (diff) | |
Merge branch 'clean2'
Conflicts:
Gemfile
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) |