diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 14:41:09 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 14:41:09 +0100 | 
| commit | 57bbba43a75a72eeacd44f1ce5fcd6f203dc321c (patch) | |
| tree | 53a59ce779f84bbbd09631a6230dceabd235d292 /chimere/admin.py | |
| parent | 06008ace42c6f972b96532e76ef69cf35b0b9eea (diff) | |
| parent | 35d3f8d36ab0b3b93d590a56667a4890951951ca (diff) | |
| download | Chimère-57bbba43a75a72eeacd44f1ce5fcd6f203dc321c.tar.bz2 Chimère-57bbba43a75a72eeacd44f1ce5fcd6f203dc321c.zip | |
Merge branch 'v2.1'
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 1 | 
1 files changed, 1 insertions, 0 deletions
| diff --git a/chimere/admin.py b/chimere/admin.py index ba8304b..b8414dc 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -244,6 +244,7 @@ class MarkerAdmin(admin.ModelAdmin):          '''          return managed_modified(self, request,                              Marker.objects.filter(pk=item_id)) +      def get_urls(self):          from django.conf.urls.defaults import patterns, url          urls = super(MarkerAdmin, self).get_urls() | 
