Merge lp://staging/~dholbach/loco-team-portal/579842 into lp://staging/loco-team-portal
Proposed by
Daniel Holbach
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 149 | ||||||||
| Proposed branch: | lp://staging/~dholbach/loco-team-portal/579842 | ||||||||
| Merge into: | lp://staging/loco-team-portal | ||||||||
| Diff against target: |
342 lines (+227/-9) 10 files modified
INSTALL (+2/-2) loco_directory/teams/admin.py (+10/-1) loco_directory/teams/management/commands/update-countries.py (+32/-0) loco_directory/teams/management/commands/update.py (+19/-0) loco_directory/teams/migrations/0003_add_countries.py (+94/-0) loco_directory/teams/models.py (+14/-1) loco_directory/teams/views.py (+1/-1) loco_directory/templates/teams/team_detail.html (+6/-2) loco_directory/venues/migrations/0003_add_country.py (+47/-0) loco_directory/venues/models.py (+2/-2) |
||||||||
| To merge this branch: | bzr merge lp://staging/~dholbach/loco-team-portal/579842 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Thomas Bechtold (community) | Approve | ||
|
Review via email:
|
|||
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
looks good and works for me