b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
api.html.haml | ||
index.html.haml | ||
markdown.html.haml | ||
permissions.html.haml | ||
ssh.html.haml | ||
system_hooks.html.haml | ||
web_hooks.html.haml | ||
workflow.html.haml |