diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
| commit | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (patch) | |
| tree | 032ae62668538be964f57a12018d1ab9f696be5f /media/archweb.js | |
| parent | fbd23db51b7160a308cd88e407e676994eb08b10 (diff) | |
| parent | 617550628b39f94e6cb11ec032eb18e6195bf64a (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoffs.html
templates/public/about.html
templates/public/download.html
templates/public/index.html
templates/public/svn.html
templates/releng/results.html
templates/todolists/view.html
Diffstat (limited to 'media/archweb.js')
0 files changed, 0 insertions, 0 deletions