Merge lp:~thisfred/u1db/doc-fixes into lp:u1db
Proposed by
Eric Casteleijn
Status: | Merged |
---|---|
Approved by: | Eric Casteleijn |
Approved revision: | 394 |
Merged at revision: | 391 |
Proposed branch: | lp:~thisfred/u1db/doc-fixes |
Merge into: | lp:u1db |
Diff against target: |
139 lines (+43/-27) 2 files modified
html-docs/conflicts.rst (+41/-27) html-docs/high-level-api.rst (+2/-0) |
To merge this branch: | bzr merge lp:~thisfred/u1db/doc-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Langridge (community) | Approve | ||
Review via email: mp+120825@code.launchpad.net |
Commit message
-fixed and clarified documentation
Description of the change
-fixed and clarified documentation
To post a comment you must log in.