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

3
Gemfile.lock
View file

@ -56,6 +56,8 @@ GEM
coderay (>= 1.0.0)
erubis (>= 2.7.0)
binding_of_caller (0.6.8)
bootstrap-datepicker-rails (1.1.1.1)
railties (>= 3.0)
builder (3.0.4)
bullet (4.3.0)
uniform_notifier
@ -264,6 +266,7 @@ DEPENDENCIES
acts_as_versioned!
better_errors
binding_of_caller
bootstrap-datepicker-rails
bullet
capistrano (= 2.13.5)
capistrano-ext