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

1
Gemfile
View file

@ -19,6 +19,7 @@ end
gem 'jquery-rails'
gem 'select2-rails'
gem 'bootstrap-datepicker-rails'
gem 'rails-assets-listjs', '0.2.0.beta.4' # remember to maintain list.*.js plugins and template engines on update
gem 'i18n-js', git: 'git://github.com/fnando/i18n-js.git' # to avoid US-ASCII js.erb error
gem 'mysql2'