heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/gullydwarf-cfdv/is330'

Browse Source 
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/gallery.html
This commit is contained in:
Christopher Allan Webber 2011-06-25 13:08:04 -05:00
commit 4765a52b1f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/templates/mediagoblin/user_pages/gallery.html
View File

@ -26,7 +26,8 @@
{% block mediagoblin_content -%}
{% if user %}
<h1><a href="{{ request.urlgen(
<h1>
<a href="{{ request.urlgen(
'mediagoblin.user_pages.user_home',
user=user.username) }}">{{ user.username }}</a>'s media</h1>