b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
cucumber.yml | ||
database.yml.example | ||
database.yml.mysql | ||
database.yml.sqlite | ||
environment.rb | ||
gitlab.yml.example | ||
routes.rb | ||
unicorn.rb.orig |