← Back to team overview

launchpad-reviewers team mailing list archive

Re: [Merge] ~ines-almeida/launchpad:social-accounts-edit-view into launchpad:master

 

Conflicts are due to the fact that this branch was rebased with master and the Social Accounts API branch (https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/457527).

Will wait for API branch to be merged in before fixing conflicts. Setting this to "WIP" in the meantime
-- 
https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/458537
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/launchpad:social-accounts-edit-view into launchpad:master.



References