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

1
Gemfile
View file

@ -16,6 +16,7 @@ group :assets do
end
gem 'jquery-rails'
gem 'select2-rails'
gem 'bootstrap-datepicker-rails'
gem 'mysql2'