Merge branch 'master' of http://github.com/andreassteph/fetsite

2013-10-28 11:25:50 +01:00
parent 637fe7dc9f 1d16b2f87a
commit fb48878b5e
3 changed files with 12 additions and 9 deletions
--- a/1
+++ b/1
@@ -84,3 +84,4 @@ gem 'rmagick'

 gem 'bootstrap-addons-rails'
 gem "jquery-fileupload-rails"
+gem "seed_dump", "~> 0.5.3"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,6 +180,7 @@ GEM
      railties (~> 3.2.0)
      sass (>= 3.1.10)
      tilt (~> 1.3)
+    seed_dump (0.5.3)
    simple_calendar (0.1.9)
      rails (>= 3.0)
    sprockets (2.2.2)
@@ -239,6 +240,7 @@ DEPENDENCIES
  rolify
  rspec-rails
  sass-rails (~> 3.2)
+  seed_dump (~> 0.5.3)
  simple_calendar (~> 0.1.9)
  sqlite3
  therubyracer