diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-04-03 22:10:32 +0200 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-04-03 22:10:32 +0200 |
| commit | 4ebbcf3b5576cc342086e2f54950a119a49f2bf9 (patch) | |
| tree | e216a9634c31047e8908a882aed9ff2545ed99e6 /Gemfile.lock | |
| parent | edf06bf6f7d4f20d5a9145a5bbf8db409fe6ab1b (diff) | |
| parent | cea2cc3c1cc1e48fc4600c698d52dfda2bde4505 (diff) | |
Merge branch 'emberjs' into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1a120fe..f286709 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) @@ -213,6 +215,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers acts_as_list backup bcrypt-ruby |