diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-06 11:05:57 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-06 11:05:57 -0300 |
| commit | 3aa14c9fbec24f5049e12a8dbb5ce059d2c8f5f3 (patch) | |
| tree | 28755cf0ae66b145d752358c1f722c2d095e877a /LICENSE | |
| parent | c738e2c8f687f3417b90c951254121cce491843a (diff) | |
| parent | 65e965c8f76677904f5d98965e13bf89726247d4 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
media/archweb.css
public/views.py
urls.py
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions