diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
| commit | 355087ebe2e3fbd5f860e4655888a89d9df52e34 (patch) | |
| tree | d01f6206a2f2d054d4d1931019f5ba2a248fe982 /packages/alpm.py | |
| parent | ae785343076fd1fe8b89f69ca370f7fcd0cdcbd4 (diff) | |
| parent | ea00a099dffd7157c93af54b5817734348d2bbc6 (diff) | |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'packages/alpm.py')
0 files changed, 0 insertions, 0 deletions