Merge lp://staging/~jaywink/diaspora-ppa/diaspora-develop-setup into lp://staging/~diaspora-ppa/diaspora-ppa/diaspora-metapackage-trunk

Proposed by Jason Robinson
Status: Merged
Merged at revision: 7
Proposed branch: lp://staging/~jaywink/diaspora-ppa/diaspora-develop-setup
Merge into: lp://staging/~diaspora-ppa/diaspora-ppa/diaspora-metapackage-trunk
Diff against target: 483 lines (+403/-15)
2 files modified
debian/changelog (+7/-0)
scripts/diasporactrl (+396/-15)
To merge this branch: bzr merge lp://staging/~jaywink/diaspora-ppa/diaspora-develop-setup
Reviewer Review Type Date Requested Status
diaspora* Team Pending
Review via email: mp+129963@code.staging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: