Conflicts: app/models/project.rb config/routes.rb db/schema.rb |
||
|---|---|---|
| .. | ||
| .gitkeep | ||
| bulk_import.rake | ||
| dev_repo.rake | ||
| dev_user.sh | ||
| gitolite_rebuild.rake | ||
| resque.rake | ||
| travis.rake | ||
Conflicts: app/models/project.rb config/routes.rb db/schema.rb |
||
|---|---|---|
| .. | ||
| .gitkeep | ||
| bulk_import.rake | ||
| dev_repo.rake | ||
| dev_user.sh | ||
| gitolite_rebuild.rake | ||
| resque.rake | ||
| travis.rake | ||