diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-19 00:42:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-01-19 00:42:18 -0300 |
| commit | 27d7ccd7a928da74a881cf4fbd508e23613780fa (patch) | |
| tree | ebed6ca44c1a5512b272685234ddfbb76fba76d8 /.gitignore | |
| parent | 755a03d279631138cb982dc07b2d67b341a4f99c (diff) | |
| parent | 523a15f81e819379d1d9ae8412ebd8a7c017a512 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/devel/clock.html
templates/packages/group_details.html
templates/packages/groups.html
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions