![]() Conflicts: app/models/project.rb config/routes.rb db/schema.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
database.yml | ||
environment.rb | ||
gitlab.yml | ||
routes.rb |
![]() Conflicts: app/models/project.rb config/routes.rb db/schema.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
database.yml | ||
environment.rb | ||
gitlab.yml | ||
routes.rb |