Ubuntu One Windows Installer

Merge lp:~ralsina/ubuntuone-windows-installer/no-hack into lp:ubuntuone-windows-installer

  1. no-hack
  2. Merge into trunk
Proposed by Roberto Alsina on 2012-03-16
Status: Merged
Approved by: Natalia Bidart on 2012-03-16
Approved revision: 108
Merged at revision: 106
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/no-hack
Merge into: lp:ubuntuone-windows-installer
Diff against target: 11 lines (+0/-1)
1 file modified
scripts/conf.py (+0/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/no-hack
Reviewer Review Type Date Requested Status
Natalia Bidart 2012-03-16 Approve on 2012-03-16
Diego Sarmentero (community) Approve on 2012-03-16
Review via email: mp+97882@code.launchpad.net

Commit Message

Stop merging the hack branch

Description of the Change

Stop merging the hack branch

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
lp:~ralsina/ubuntuone-windows-installer/no-hack updated on 2012-03-16
107. By Roberto Alsina on 2012-03-16

oops, not the same without a comma

108. By Roberto Alsina on 2012-03-16

removed print

Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/conf.py'
2--- scripts/conf.py 2012-01-09 14:25:53 +0000
3+++ scripts/conf.py 2012-03-16 14:42:17 +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",

Subscribers

People subscribed via source and target branches