end of day commit

2012-08-29 17:42:04 +02:00
parent 89700f36e9
commit 8213bae2c6
57 changed files with 1109 additions and 128 deletions
@@ -157,8 +157,6 @@ GEM
    rest-client (1.6.7)
      mime-types (>= 1.16)
    rqrcode (0.4.2)
-    rqrcode-rails3 (0.1.5)
-      rqrcode (>= 0.4.2)
    rspec (2.11.0)
      rspec-core (~> 2.11.0)
      rspec-expectations (~> 2.11.0)
@@ -240,7 +238,7 @@ DEPENDENCIES
  mini_magick
  pry
  rails (= 3.2.8)
-  rqrcode-rails3
+  rqrcode
  rspec-rails
  sass-rails (~> 3.2.3)
  selenium-webdriver