66fb3909a5
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 |
66fb3909a5
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 |