diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
| commit | dbb508b7222081b523ce3e0bd2b69f5fea6c7050 (patch) | |
| tree | f5f3a97b9465504ed9e7633a0c385669b7463d3c /retro/static/2013/favicon.29302f683ff8.ico | |
| parent | fd788c5fcf9009540ad14a869dcebdfd30fb9d6f (diff) | |
| parent | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (diff) | |
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes
Conflicts:
templates/news/list.html
templates/public/index.html
Diffstat (limited to 'retro/static/2013/favicon.29302f683ff8.ico')
| -rw-r--r-- | retro/static/2013/favicon.29302f683ff8.ico | bin | 0 -> 575 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/retro/static/2013/favicon.29302f683ff8.ico b/retro/static/2013/favicon.29302f683ff8.ico Binary files differnew file mode 100644 index 00000000..55497b85 --- /dev/null +++ b/retro/static/2013/favicon.29302f683ff8.ico |