Mercurial > public > sg101

changeset 1053:03237aaad839

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Thu, 03 Mar 2016 20:22:41 -0600
parents 1a9a03637f77 (current diff) 37bc59f22967 (diff)
children 5b8062cce722
files
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/requirements.txt	Thu Mar 03 20:22:16 2016 -0600
+++ b/requirements.txt	Thu Mar 03 20:22:41 2016 -0600
@@ -4,7 +4,7 @@
 bleach==1.4
 boto==2.13.0
 celery==3.1.18
-Django==1.8.8
+Django==1.8.10
 django-haystack==2.4.1
 django-picklefield==0.3.1
 django-tagging==0.4
--- a/sg101/templates/base.html	Thu Mar 03 20:22:16 2016 -0600
+++ b/sg101/templates/base.html	Thu Mar 03 20:22:41 2016 -0600
@@ -113,8 +113,6 @@
       <img src="{% static "logos/nesma.png" %}" alt="NESMA" title="N.E.S.M.A."></a></li>
    <li><a href="http://hangninesurfmusic.blogspot.de/">
       <img src="{% static "logos/hangnine.png" %}" alt="HangNine" title="HangNine Blog"></a></li>
-   <li><a href="http://www.surfrockmusic.com">
-      <img src="{% static "logos/surfrock.png" %}" alt="SurfRockMusic.com" title="SurfRockMusic.com"></a></li>
    <li><a href="http://www.northseasurfradio.com">
       <img src="{% static "logos/northsea.png" %}" alt="NSSR" title="North Sea Surf Radio"></a></li>
    <li><a href="http://www.luxuriamusic.com/podcasts/Fiberglass%20Jungle">