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

Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
benni 2012-11-24 15:27:48 +01:00
commit 7c9d666909
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -153,6 +153,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thor (0.16.0)
@ -197,6 +198,7 @@ DEPENDENCIES
simple-navigation
simple-navigation-bootstrap
simple_form
sqlite3
therubyracer
twitter-bootstrap-rails
uglifier (>= 1.0.3)