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

Merge branch 'master' into i18n

Browse source 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
This commit is contained in:
wvengen 2013-10-09 23:57:43 +02:00
commit 34a4951e28
21 changed files with 382 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,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 i18n
//= require i18n/translations