Merge lp://staging/~lucyllewy/loco-team-portal/django-1.4 into lp://staging/loco-team-portal
Proposed by
Lucy Llewellyn
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~lucyllewy/loco-team-portal/django-1.4 |
| Merge into: | lp://staging/loco-team-portal |
| Diff against target: |
202 lines (+26/-28) 14 files modified
loco_directory/events/feeds.py (+1/-1) loco_directory/events/urls.py (+1/-1) loco_directory/manage.py (+6/-8) loco_directory/meetings/feeds.py (+1/-1) loco_directory/meetings/urls.py (+1/-1) loco_directory/services/urls.py (+1/-1) loco_directory/settings.py (+1/-1) loco_directory/teams/feeds.py (+1/-1) loco_directory/teams/urls.py (+1/-1) loco_directory/urls.py (+2/-2) loco_directory/userprofiles/urls.py (+1/-1) loco_directory/venues/urls.py (+1/-1) requirements/dev.txt (+4/-4) requirements/prod.txt (+4/-4) |
| To merge this branch: | bzr merge lp://staging/~lucyllewy/loco-team-portal/django-1.4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adnane Belmadiaf | Approve | ||
|
Review via email:
|
|||
Description of the change
Update to django 1.4
To post a comment you must log in.
Revision history for this message
| Lucy Llewellyn (lucyllewy) wrote | # |
Revision history for this message
| Lucy Llewellyn (lucyllewy) wrote | # |
Unmerged revisions
- 685. By Lucy Llewellyn
-
update to django 1.4
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I'm working on upgrading beyond 1.4 through to 1.10. I'm doing this piecemeal so that it is easy to see every step in the journey and be able to rollback if needed.