diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:13:02 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:13:02 -0500 |
| commit | 422aaee026c57b65dda81b78b6a0f49263c6dd1e (patch) | |
| tree | 6bc80bcb093ed2f0932d4469a4400ce293c94860 /media/logos/archlinux-logo-black-1200dpi.png | |
| parent | 464b8d1fa572ab57d41569d45ba94b771e0a5ced (diff) | |
| parent | 83eea8e167e698f8f14ea2494837510404dc75ff (diff) | |
Merge branch 'archweb' into archweb-genericarchweb-generic
# Conflicts:
# templates/public/download.html
Diffstat (limited to 'media/logos/archlinux-logo-black-1200dpi.png')
0 files changed, 0 insertions, 0 deletions