Merge lp://qastaging/~robertsteckroth/ubuntu-community-accomplishments/Bust0ut-branching into lp://qastaging/~jonobacon/ubuntu-community-accomplishments/askubuntu-accomplishments
Proposed by
Robert Steckroth
Status: | Merged |
---|---|
Merged at revision: | 156 |
Proposed branch: | lp://qastaging/~robertsteckroth/ubuntu-community-accomplishments/Bust0ut-branching |
Merge into: | lp://qastaging/~jonobacon/ubuntu-community-accomplishments/askubuntu-accomplishments |
Diff against target: |
59 lines (+23/-11) (has conflicts) 2 files modified
accomplishments/ubuntu-community/en/support/askubuntu-sportsmanship.accomplishment (+13/-5) accomplishments/ubuntu-community/en/support/askubuntu-stellarquestion.accomplishment (+10/-6) Text conflict in accomplishments/ubuntu-community/en/support/askubuntu-sportsmanship.accomplishment |
To merge this branch: | bzr merge lp://qastaging/~robertsteckroth/ubuntu-community-accomplishments/Bust0ut-branching |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jono Bacon | Pending | ||
Review via email:
|
Description of the change
Added the Sportsmanship badge.
To post a comment you must log in.