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