Merge lp://staging/~michael.nelson/rnr-server/fix-admin-since-django-upgrade into lp://staging/rnr-server
Proposed by
Michael Nelson
Status: | Merged |
---|---|
Approved by: | Michael Nelson |
Approved revision: | 237 |
Merged at revision: | 237 |
Proposed branch: | lp://staging/~michael.nelson/rnr-server/fix-admin-since-django-upgrade |
Merge into: | lp://staging/rnr-server |
Diff against target: |
36 lines (+12/-3) 2 files modified
django_project/config_dev/urls.py (+10/-1) django_project/templates/admin/login.html (+2/-2) |
To merge this branch: | bzr merge lp://staging/~michael.nelson/rnr-server/fix-admin-since-django-upgrade |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Nelson (community) | Approve | ||
Jonas G. Drange (community) | Approve | ||
Review via email:
|
Commit message
Remove admin_media_prefix template tag which is no longer available post Django 1.4.
Description of the change
The admin_media_prefix template tag is no longer used post Django 1.4.
To post a comment you must log in.
Neat