summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e07b89e..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)
@@ -84,12 +84,12 @@ GEM
faye-websocket (0.4.1)
eventmachine (>= 0.12.0)
fssm (0.2.8.1)
- haml (3.1.4)
+ haml (3.1.7)
hike (1.2.1)
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)