LoCo Team Portal

Merge lp://staging/~daker/loco-team-portal/fix.1273491 into lp://staging/loco-team-portal

fix.1273491
Merge into 0.2

Proposed by Adnane Belmadiaf on 2014-08-04

Status:

Needs review

Proposed branch:

lp://staging/~daker/loco-team-portal/fix.1273491

Merge into:

lp://staging/loco-team-portal

Diff against target:

51 lines (+18/-1)

2 files modified

loco_directory/media/css/styles.css (+0/-1)
loco_directory/teams/utils.py (+18/-0)

To merge this branch:

bzr merge lp://staging/~daker/loco-team-portal/fix.1273491

Critical

Triaged

Link a bug report

Reviewer	Date Requested	Status
Lucy Llewellyn (community)		Needs Fixing on 2016-08-05
Pablo Rubianes (community)		Approve on 2015-05-01
ԜаӀtеr Ⅼарсһуnѕkі	2016-02-13	Pending
LoCo Team Portal Developers	2014-08-04	Pending
Review via email: mp+229522@code.staging.launchpad.net

Commit message

Fixed merge functionnality

lp://staging/~daker/loco-team-portal/fix.1273491 updated on 2014-08-04

683. By Adnane Belmadiaf on 2014-08-04: Fixed icons
684. By Adnane Belmadiaf on 2014-08-04: Fixes

Revision history for this message

Pablo Rubianes (pablorubianes-uy) wrote on 2015-05-01:

Approved in order to merge

review: Approve

Revision history for this message

Lucy Llewellyn (lucyllewy) wrote on 2016-08-05:

the change to loco_directory/media/css/styles.css appears unrelated. This should be backed-out leaving just the changes in loco_directory/teams/utils.py for this merge to proceed.

review: Needs Fixing