66fb3909a5
Conflicts: app/models/project.rb config/routes.rb db/schema.rb |
||
---|---|---|
.. | ||
fixtures | ||
migrate | ||
pkey.example | ||
schema.rb | ||
seeds.rb |
66fb3909a5
Conflicts: app/models/project.rb config/routes.rb db/schema.rb |
||
---|---|---|
.. | ||
fixtures | ||
migrate | ||
pkey.example | ||
schema.rb | ||
seeds.rb |