b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
design.html.haml | ||
index.html.haml | ||
password.html.haml | ||
show.html.haml | ||
token.html.haml |