b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
api_helpers.rb | ||
db_cleaner.rb | ||
gitolite_stub.rb | ||
login_helpers.rb | ||
matchers.rb | ||
stubbed_repository.rb | ||
valid_commit.rb |