d51618b9a1
Conflicts: config/gitlab.yml.example config/initializers/1_settings.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
database.yml.mysql | ||
database.yml.postgresql | ||
deploy.rb.example | ||
environment.rb | ||
gitlab.yml.example | ||
puma.rb.example | ||
resque.yml.example | ||
routes.rb |