diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-22 00:36:57 -0400 |
| commit | df7a6aa620af6a165bdacd755757f8cb1179331c (patch) | |
| tree | 384b4c62d1f50d8effb733d81d2a810666807624 /public/static/logos/archlinux-logo-black-1200dpi.png | |
| parent | 94f972bb892dbf9a86f089f1872ae6d849c0cd0e (diff) | |
| parent | a22557811a24b68ef85d4271787c48d8d1e4fc99 (diff) | |
Merge branch 'archweb-generic2'
Conflicts:
README.BRANDING
local_settings.py.example
packages/templatetags/package_extras.py
public/views.py
releng/views.py
settings.py
sitestatic/archnavbar/archnavbar.css
sitestatic/silhouette.png
templates/base.html
templates/packages/differences.html
templates/packages/opensearch.xml
templates/packages/search.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'public/static/logos/archlinux-logo-black-1200dpi.png')
| -rw-r--r-- | public/static/logos/archlinux-logo-black-1200dpi.png | bin | 283011 -> 131811 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/public/static/logos/archlinux-logo-black-1200dpi.png b/public/static/logos/archlinux-logo-black-1200dpi.png Binary files differindex a3082c39..3b6b6e48 100644 --- a/public/static/logos/archlinux-logo-black-1200dpi.png +++ b/public/static/logos/archlinux-logo-black-1200dpi.png |
