Mercurial > public > sg101
changeset 967:734a4a350bd5
Merge with upstream.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Wed, 02 Sep 2015 20:50:44 -0500 |
| parents | 51a2051588f5 (current diff) 2aaf9fa5867b (diff) |
| children | bd594bcba5eb |
| files | |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/requirements.txt Wed Sep 02 20:50:08 2015 -0500 +++ b/requirements.txt Wed Sep 02 20:50:44 2015 -0500 @@ -1,4 +1,4 @@ -Django==1.7.9 +Django==1.7.10 Markdown==2.5.1 MySQL-python==1.2.4 -e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
--- a/requirements_dev.txt Wed Sep 02 20:50:08 2015 -0500 +++ b/requirements_dev.txt Wed Sep 02 20:50:44 2015 -0500 @@ -1,4 +1,4 @@ -Django==1.7.9 +Django==1.7.10 Markdown==2.5.1 MySQL-python==1.2.5 django-debug-toolbar==1.3.0
--- a/requirements_mac.txt Wed Sep 02 20:50:08 2015 -0500 +++ b/requirements_mac.txt Wed Sep 02 20:50:44 2015 -0500 @@ -1,4 +1,4 @@ -Django==1.7.9 +Django==1.7.10 Markdown==2.5.1 MySQL-python==1.2.5 django-debug-toolbar==1.0
--- a/sg101/templates/base.html Wed Sep 02 20:50:08 2015 -0500 +++ b/sg101/templates/base.html Wed Sep 02 20:50:44 2015 -0500 @@ -92,9 +92,9 @@ <div id="content-primary" class="span-19 last"> <div> - <a href="/forums/topic/26502/"> - <img src="{{ STATIC_URL }}images/NSSRTopAlbum101.png" alt="NSSR Top 101 Surf Albums" - title="Vote for the Surf Album Top 101 on North Sea Surf Radio"/></a> + <a href="/forums/topic/26666/"> + <img src="{{ STATIC_URL }}images/NSSRTopAlbum101-2015.png" alt="NSSR Top 101 Surf Albums" + title="Listen to the Surf Album Top 101 on North Sea Surf Radio"/></a> </div> {% block content %} {% endblock %}