diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:05:35 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:05:35 -0300 |
commit | fbd23db51b7160a308cd88e407e676994eb08b10 (patch) | |
tree | e3816cc4e3f0ee07539fb4464b2d886a43ecc318 /templates/mirrors | |
parent | a8b2fc84ba96c83ec1addf89ac04608fbf572705 (diff) | |
parent | 0f6c80e9a36bc5770e95543b4374c5ace4383cf5 (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
packages/urls.py
templates/packages/details.html
Diffstat (limited to 'templates/mirrors')
-rw-r--r-- | templates/mirrors/mirrors.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index 41cca6fa..53a68005 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -28,7 +28,7 @@ <td>{{mirror.get_tier_display}}</td> <td>{{mirror.country}}</td> <td>{{mirror.isos|yesno}}</td> - <td class="wrap">{{mirror.supported_protocols}}</td> + <td class="wrap">{{mirror.supported_protocols|join:", "}}</td> {% if user.is_authenticated %} <td>{{mirror.public|yesno}}</td> <td>{{mirror.active|yesno}}</td> |