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/feeds | |
| 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/feeds')
0 files changed, 0 insertions, 0 deletions