diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
| commit | af79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch) | |
| tree | fd6c4dab5dc56fed5f616ddec20e1f82780f20fe /Gemfile.lock | |
| parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
| parent | 9f14a9a6573db607b79124524088803812454515 (diff) | |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f9a6596..64efe4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM eventmachine (1.0.0.beta.4) execjs (1.3.0) multi_json (~> 1.0) - factory_girl (2.6.1) + factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) @@ -89,7 +89,7 @@ GEM hirb (0.6.1) http_accept_language (1.0.2) http_parser.rb (0.5.3) - i18n (0.6.0) + i18n (0.6.1) journey (1.0.3) jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) |