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 /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 'mirrors')
| -rw-r--r-- | mirrors/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mirrors/models.py b/mirrors/models.py index 4f70e5a9..a8217844 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -42,7 +42,7 @@ class Mirror(models.Model): def supported_protocols(self): protocols = MirrorProtocol.objects.filter( urls__mirror=self).order_by('protocol').distinct() - return ", ".join([p.protocol for p in protocols]) + return sorted(protocols) def downstream(self): return Mirror.objects.filter(upstream=self).order_by('name') |