b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
_create_common.js.haml | ||
_create_line.js.haml | ||
_form.html.haml | ||
_load.js.haml | ||
_notes.html.haml | ||
_notes_list.html.haml | ||
_per_line_form.html.haml | ||
_per_line_show.html.haml | ||
_reply_button.html.haml | ||
_show.html.haml | ||
create.js.haml | ||
index.js.haml |