Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
backup.rake | ||
enable_automerge.rake | ||
gitolite_rebuild.rake | ||
setup.rake | ||
status.rake | ||
test.rake | ||
write_hook.rake |
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
backup.rake | ||
enable_automerge.rake | ||
gitolite_rebuild.rake | ||
setup.rake | ||
status.rake | ||
test.rake | ||
write_hook.rake |