Merge lp://qastaging/~charm-contributors/pyjuju/docs-fix-drafts into lp://qastaging/~charm-contributors/pyjuju/docs
Proposed by
Clint Byrum
Status: | Merged |
---|---|
Merged at revision: | 71 |
Proposed branch: | lp://qastaging/~charm-contributors/pyjuju/docs-fix-drafts |
Merge into: | lp://qastaging/~charm-contributors/pyjuju/docs |
Diff against target: |
38 lines (+6/-0) 3 files modified
Makefile (+1/-0) source/drafts/.htaccess (+4/-0) source/index.rst (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~charm-contributors/pyjuju/docs-fix-drafts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brandon Holtsclaw | Approve | ||
Review via email: mp+128770@code.qastaging.launchpad.net |
Description of the change
Moves implemented changes into the root dir and the index (where appropriate). Also adds a .htaccess redirect.
To post a comment you must log in.
looks good to me, merging