diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-21 02:11:13 -0300 |
| commit | a30350ac6e76c66d14f6d78ed2b5ae4e5799c79c (patch) | |
| tree | a2b7127366a1b9d8d5be9fcda5abefacef7d2579 /templates/mirrors/mirrors.html | |
| parent | d8f82d9d72eec6042536797f75e06a9296f4cc71 (diff) | |
| parent | 2470c543d60c96343a5b0fefe04464b5b445b859 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
devel/views.py
feeds.py
templates/devel/index.html
templates/packages/flag.html
templates/public/index.html
todolists/views.py
urls.py
Diffstat (limited to 'templates/mirrors/mirrors.html')
| -rw-r--r-- | templates/mirrors/mirrors.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index 7562cb6f..41cca6fa 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -15,7 +15,6 @@ {% if user.is_authenticated %} <th>Public</th> <th>Active</th> - <th>Rsync IPs</th> <th>Admin Email</th> <th>Notes</th> {% endif %} @@ -33,7 +32,6 @@ {% if user.is_authenticated %} <td>{{mirror.public|yesno}}</td> <td>{{mirror.active|yesno}}</td> - <td class="wrap">{{mirror.rsync_ips.all|join:', '}}</td> <td>{{mirror.admin_email}}</td> <td class="wrap">{{mirror.notes|linebreaks}}</td> {% endif %} |