bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2013-10-28 11:25:50 +01:00
parent 637fe7dc9f 1d16b2f87a
commit fb48878b5e
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -84,3 +84,4 @@ gem 'rmagick'
gem 'bootstrap-addons-rails' gem 'bootstrap-addons-rails'
gem "jquery-fileupload-rails" gem "jquery-fileupload-rails"
gem "seed_dump", "~> 0.5.3"

2
Gemfile.lock
View File

@@ -180,6 +180,7 @@ GEM
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
seed_dump (0.5.3)
simple_calendar (0.1.9) simple_calendar (0.1.9)
rails (>= 3.0) rails (>= 3.0)
sprockets (2.2.2) sprockets (2.2.2)
@@ -239,6 +240,7 @@ DEPENDENCIES
rolify rolify
rspec-rails rspec-rails
sass-rails (~> 3.2) sass-rails (~> 3.2)
seed_dump (~> 0.5.3)
simple_calendar (~> 0.1.9) simple_calendar (~> 0.1.9)
sqlite3 sqlite3
therubyracer therubyracer