diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-26 16:57:26 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-26 16:57:26 -0400 |
commit | 59d8a08232ae7872e2777ac42756fa259e1d1f6f (patch) | |
tree | 7a6f6819ca4d3226f33017c22de1e55a65e1fd6c /Gemfile.lock | |
parent | fedc51fb2d95d1e67c06e560448563a64fa458b1 (diff) | |
parent | 2aaaf29ae291edc34d0512ce9a812fc0de14f76b (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 145a7fc..2de3fea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,6 +50,9 @@ GEM delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) + figaro (0.7.0) + bundler (~> 1.0) + rails (>= 3, < 5) foreigner (1.6.1) activerecord (>= 3.0.0) hike (1.2.3) @@ -143,6 +146,7 @@ DEPENDENCIES coffee-rails (~> 4.0.0) daemons delayed_job_active_record + figaro httparty jbuilder (~> 1.2) jquery-rails |