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 /sitestatic/logos | |
| 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 'sitestatic/logos')
| -rw-r--r-- | sitestatic/logos/apple-touch-icon-114x114.png | bin | 3240 -> 2088 bytes |
| -rw-r--r-- | sitestatic/logos/apple-touch-icon-144x144.png | bin | 0 -> 3063 bytes |
| -rw-r--r-- | sitestatic/logos/apple-touch-icon-57x57.png | bin | 1638 -> 1173 bytes |
| -rw-r--r-- | sitestatic/logos/apple-touch-icon-72x72.png | bin | 2076 -> 1437 bytes |
| -rw-r--r-- | sitestatic/logos/icon-transparent-64x64.png | bin | 0 -> 1430 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/sitestatic/logos/apple-touch-icon-114x114.png b/sitestatic/logos/apple-touch-icon-114x114.png Binary files differindex e6365ee2..a5b4282a 100644 --- a/sitestatic/logos/apple-touch-icon-114x114.png +++ b/sitestatic/logos/apple-touch-icon-114x114.png diff --git a/sitestatic/logos/apple-touch-icon-144x144.png b/sitestatic/logos/apple-touch-icon-144x144.png Binary files differnew file mode 100644 index 00000000..cd177f2c --- /dev/null +++ b/sitestatic/logos/apple-touch-icon-144x144.png diff --git a/sitestatic/logos/apple-touch-icon-57x57.png b/sitestatic/logos/apple-touch-icon-57x57.png Binary files differindex d2d78262..d7d592c7 100644 --- a/sitestatic/logos/apple-touch-icon-57x57.png +++ b/sitestatic/logos/apple-touch-icon-57x57.png diff --git a/sitestatic/logos/apple-touch-icon-72x72.png b/sitestatic/logos/apple-touch-icon-72x72.png Binary files differindex 170656e0..5983885f 100644 --- a/sitestatic/logos/apple-touch-icon-72x72.png +++ b/sitestatic/logos/apple-touch-icon-72x72.png diff --git a/sitestatic/logos/icon-transparent-64x64.png b/sitestatic/logos/icon-transparent-64x64.png Binary files differnew file mode 100644 index 00000000..0318f183 --- /dev/null +++ b/sitestatic/logos/icon-transparent-64x64.png |
