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.lock
This commit is contained in:
wvengen 2013-07-18 20:28:56 +02:00
commit b9599ce455
22 changed files with 342 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -183,6 +183,8 @@ GEM
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.13)
rails-settings-cached (0.2.4)
rails (>= 3.0.0)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
@ -299,6 +301,7 @@ DEPENDENCIES
prawn
quiet_assets
rails (~> 3.2.9)
rails-settings-cached (= 0.2.4)
resque
ruby-prof
sass-rails (~> 3.2.3)