diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 09:16:42 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 09:24:19 -0600 |
commit | d62ae70552d2981a23010967bf80a7b68ca8b6a6 (patch) | |
tree | 4c64217507c4a63b0a9973923259b362cc2b8eed /templates/book.html | |
parent | bf85bd2b1fd05126010b9384edcb086303bbeddf (diff) | |
parent | cc378999abd39e070dbc87b482f022201a86b7fa (diff) | |
download | askbot-d62ae70552d2981a23010967bf80a7b68ca8b6a6.tar.gz askbot-d62ae70552d2981a23010967bf80a7b68ca8b6a6.tar.bz2 askbot-d62ae70552d2981a23010967bf80a7b68ca8b6a6.zip |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.po
templates/authopenid/sendpw.html
templates/authopenid/signin.html
templates/header.html
templates/index.html
templates/question_edit.html
Diffstat (limited to 'templates/book.html')
-rw-r--r-- | templates/book.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/book.html b/templates/book.html index dddd13e6..23166cb7 100644 --- a/templates/book.html +++ b/templates/book.html @@ -118,7 +118,7 @@ </a> <div class="bookQuestionItem"> <h3> - <a title="{{question.summary}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a> + <a title="{{question.summary|collapse}}" href="/questions/{{question.id}}/{{question.title}}">{{question.title}}</a> </h3> <div class="tags"> {% for tag in question.tagname_list %} |