search

GirlsCodersWarsaw / CakeMaster_Ania

This is Ania's training project to get to know rails.
1 stars 0 forks source link

Merge branch 'develop' into feature/image #24

Closed Czarrrna closed 8 years ago

Czarrrna commented 8 years ago

Conflicts: .gitignore Gemfile Gemfile.lock app/views/cakes/_cake.html.erb app/views/cakes/_form.html.erb app/views/cakes/edit.html.erb config/routes.rb db/schema.rb