OpenERP Community Backports (Web)

Merge lp://staging/~therp-nl/ocb-web/6.1_lp1340813 into lp://staging/ocb-web/6.1

  1. 6.1_lp1340813
  2. Merge into 6.1
Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 2523
Proposed branch: lp://staging/~therp-nl/ocb-web/6.1_lp1340813
Merge into: lp://staging/ocb-web/6.1
Diff against target: 33 lines (+14/-5)
1 file modified
addons/web/controllers/main.py (+14/-5)
To merge this branch: bzr merge lp://staging/~therp-nl/ocb-web/6.1_lp1340813
Reviewer Review Type Date Requested Status
Yann Papouin code review Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+226487@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Yann Papouin (yann-papouin) wrote :

Ok

review: Approve (code review)
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

6.1 still lives on launchpad, so we can process with this one here.

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

OK, I think we can proceed with the merge due to the 2 approvals. May I?

Regards.

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