Merge pull request #139 from jasnow/master

Fix tab issue in Gemfile; Upgraded 5 gems by rebuilding Gemfile.lock fil...
2014-07-14 11:34:31 -04:00
parent 702cf9b5a8 96af670ab5
commit 114cc5fb62
2 changed files with 6 additions and 6 deletions
@@ -70,10 +70,10 @@ GEM
    coffee-rails (3.2.2)
      coffee-script (>= 2.2.0)
      railties (~> 3.2.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
      coffee-script-source
      execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.7.1)
    cucumber (1.3.15)
      builder (>= 2.1.2)
      diff-lcs (>= 1.1.3)
@@ -131,7 +131,7 @@ GEM
    highline (1.6.21)
    hike (1.2.3)
    http_parser.rb (0.6.0)
-    i18n (0.6.9)
+    i18n (0.6.11)
    journey (1.0.4)
    jquery-fileupload-rails (0.4.1)
      actionpack (>= 3.1)
@@ -238,7 +238,7 @@ GEM
    ruby_parser (3.5.0)
      sexp_processor (~> 4.1)
    safe_yaml (0.9.7)
-    sass (3.3.9)
+    sass (3.3.10)
    sass-rails (3.2.6)
      railties (~> 3.2.0)
      sass (>= 3.1.10)
@@ -285,7 +285,7 @@ GEM
      polyglot
      polyglot (>= 0.3.1)
    trollop (2.0)
-    tzinfo (0.3.39)
+    tzinfo (0.3.40)
    uglifier (2.5.1)
      execjs (>= 0.3.0)
      json (>= 1.8.0)