Merge branch 'when_docs' of git://github.com/tartansandal/ansible into devel
Conflicts: docsite/latest/rst/playbooks2.rst docsite/latest/searchindex.js
Showing
Please
register
or
sign in
to comment
Conflicts: docsite/latest/rst/playbooks2.rst docsite/latest/searchindex.js