Ignore:
Timestamp:
Apr 6, 2012 10:14:33 AM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, merge, sabiod
Children:
a6a58a4, 54cb70b
Parents:
897fe95 (diff), e5778ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (06/04/2012 10:14:33)
git-committer:
yomguy <yomguy@…> (06/04/2012 10:14:33)
Message:

Merge branch 'master' into crem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/templates/telemeta/base.html

    r77a3c08 r8b53288  
    6565{% else %} 
    6666<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
    67 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a> 
     67<a href="{% url telemeta-login %}">{% trans "Sign in" %}</a> 
    6868{% endif %} 
    6969</div> 
Note: See TracChangeset for help on using the changeset viewer.