diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-12 15:52:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-12 15:52:08 -0300 |
| commit | 57804e82978727001fc62e5b1106d69531a9cd97 (patch) | |
| tree | 770756414046565af864487a0020f2ef7be8df0a /settings.py | |
| parent | 37075e5f3423a69fec03faf31ce2133c55374dfc (diff) | |
| parent | f6464da0e14047e9db803f4b40c18ba644e75f24 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/packages/packages_list.html
templates/public/index.html
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions