b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
_commits.html.haml | ||
_diffs.html.haml | ||
_how_to_merge.html.haml | ||
_mr_accept.html.haml | ||
_mr_box.html.haml | ||
_mr_title.html.haml |