diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-06-20 19:06:19 +0200 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-06-20 19:06:19 +0200 |
| commit | eb0e1cc5c26275ff3e5c341404e8bc558f8312b8 (patch) | |
| tree | 71f449ccd6f15422717de3ac24f87d5e888ddd79 /Gemfile.lock | |
| parent | df6e17e48995f25e72509986f30700d778b179b6 (diff) | |
| parent | 3b27a5d45b12f6bac65da2a8e17387bfda42a2f1 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1a120fe..010c3d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,8 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) + active_model_serializers (0.7.0) + activemodel (>= 3.0) activemodel (3.2.13) activesupport (= 3.2.13) builder (~> 3.0.0) @@ -207,12 +209,15 @@ GEM chronic (>= 0.6.3) whois (2.7.0) will_paginate (3.0.4) + will_paginate-bootstrap (0.2.2) + will_paginate (>= 3.0.3) yajl-ruby (1.1.0) PLATFORMS ruby DEPENDENCIES + active_model_serializers acts_as_list backup bcrypt-ruby @@ -254,3 +259,4 @@ DEPENDENCIES whenever whois will_paginate + will_paginate-bootstrap |