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
	app/views/deliveries/_form.html.haml
This commit is contained in:
wvengen 2013-07-17 11:04:28 +02:00
commit eef4626107
32 changed files with 708 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -212,6 +212,9 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
select2-rails (3.4.3)
sass-rails
thor (~> 0.14)
simple-navigation (3.11.0)
activesupport (>= 2.3.2)
simple-navigation-bootstrap (1.0.0)
@ -299,6 +302,7 @@ DEPENDENCIES
resque
ruby-prof
sass-rails (~> 3.2.3)
select2-rails
simple-navigation
simple-navigation-bootstrap
simple_form