Ubuntu One Windows Installer

Merge lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.91 into lp:ubuntuone-windows-installer/stable-3-0

Proposed by Natalia Bidart on 2012-03-20

Status:	Merged
Approved by:	Natalia Bidart on 2012-03-20
Approved revision:	102
Merged at revision:	102
Proposed branch:	lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.91
Merge into:	lp:ubuntuone-windows-installer/stable-3-0
Diff against target:	11 lines (+0/-1) 1 file modified scripts/conf.py (+0/-1)
To merge this branch:	bzr merge lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.91
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Brian Curtin (community)		2012-03-20	Approve on 2012-03-20
Review via email: mp+98445@code.launchpad.net

[ Roberto Alsina <email address hidden> ]
- Stop merging the hack branch.

Revision history for this message

Brian Curtin (brian.curtin) wrote on 2012-03-20:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'scripts/conf.py'
2	--- scripts/conf.py 2012-01-09 14:25:53 +0000
3	+++ scripts/conf.py 2012-03-20 16:15:03 +0000
4	@@ -29,7 +29,6 @@
5	)
6	U1_WINDOWS_INSTALLER_BRANCHES = (
7	"lp:ubuntuone-windows-installer",
8	- "lp:~ralsina/ubuntuone-windows-installer/register_plus_login"
9	)
10	U1_STORAGE_PROTOCOL_BRANCHES = (
11	"lp:ubuntuone-storage-protocol",