Merge lp://staging/~mako/ubuntu-codeofconduct/license into lp://staging/ubuntu-codeofconduct
Proposed by
Benjamin Mako Hill
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~mako/ubuntu-codeofconduct/license | ||||
| Merge into: | lp://staging/ubuntu-codeofconduct | ||||
| Diff against target: |
26 lines (+11/-0) 2 files modified
CodeOfConduct.txt (+5/-0) LeadershipCodeOfConduct.txt (+6/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~mako/ubuntu-codeofconduct/license | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Pending | ||
|
Review via email:
|
|||
Description of the change
Adds a mention to the bottom of both codes about the license status of the files.
There may be better places to note this (e.g., in a separate COPYING file) but we also want to make sure that the changes is reflected on the website?
I don't have a strong feeling. Previous version of the page on the Ubuntu website made the license clear and, as a result, many many other projects adopted our code. The current version makes it impossible to figure this out so we should fix this, one way or another.
To post a comment you must log in.
Unmerged revisions
- 15. By Benjamin Mako Hill
-
added a paragraph to show that both the codes of conduct are released
under CC BY-SA
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
