projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5949be9
a0cf14f
)
Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
author
Christopher Allan Webber
<cwebber@dustycloud.org>
Sun, 3 Jul 2011 13:31:35 +0000
(08:31 -0500)
committer
Christopher Allan Webber
<cwebber@dustycloud.org>
Sun, 3 Jul 2011 13:31:35 +0000
(08:31 -0500)
1
2
mediagoblin/templates/mediagoblin/user_pages/media.html
patch
|
diff1
|
diff2
|
blob
|
history
mediagoblin/templates/mediagoblin/user_pages/user.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mediagoblin/templates/mediagoblin/user_pages/media.html
Simple merge
diff --cc
mediagoblin/templates/mediagoblin/user_pages/user.html
Simple merge
projects / mediagoblin.git / commitdiff