Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'master' into updated-gems

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
wvengen 2013-10-09 10:37:02 +02:00
commit bdce1b5872
64 changed files with 1039 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -202,6 +202,8 @@ GEM
activesupport (= 3.2.14)
bundler (~> 1.0)
railties (= 3.2.14)
rails-assets-listjs (0.2.0.beta.4)
railties (>= 3.1)
rails-settings-cached (0.2.4)
rails (>= 3.0.0)
railties (3.2.14)
@ -346,6 +348,7 @@ DEPENDENCIES
prawn
quiet_assets
rails (~> 3.2.9)
rails-assets-listjs (= 0.2.0.beta.4)
rails-settings-cached (= 0.2.4)
resque
rspec-core