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

4
app/assets/javascripts/application.js
View file

@ -7,6 +7,10 @@
//= require bootstrap-datepicker/locales/bootstrap-datepicker.de
//= require bootstrap-datepicker/locales/bootstrap-datepicker.nl
//= require jquery.observe_field
//= require list
//= require list.unlist
//= require list.delay
//= require list.reset
//= require rails.validations
//= require rails.validations.simple_form
//= require_self