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

Resolve merge conflicts

Browse source
This commit is contained in:
Julius Rapp 2013-07-07 14:58:57 +02:00
commit a5565b436f
18 changed files with 72 additions and 880 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -18,6 +18,7 @@ end
gem 'jquery-rails'
gem 'select2-rails'
gem 'bootstrap-datepicker-rails'
gem 'mysql2'