cbd78922ee
Conflicts: app/views/layouts/project.html.haml db/schema.rb |
||
---|---|---|
.. | ||
fixtures | ||
migrate | ||
pkey.example | ||
schema.rb | ||
seeds.rb |
cbd78922ee
Conflicts: app/views/layouts/project.html.haml db/schema.rb |
||
---|---|---|
.. | ||
fixtures | ||
migrate | ||
pkey.example | ||
schema.rb | ||
seeds.rb |