projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
97ce256
d7ecae5
)
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
author
Aditi
<aditi.iitr@gmail.com>
Fri, 9 Aug 2013 11:08:55 +0000
(16:38 +0530)
committer
Aditi
<aditi.iitr@gmail.com>
Fri, 9 Aug 2013 11:08:55 +0000
(16:38 +0530)
1
2
mediagoblin/user_pages/views.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mediagoblin/user_pages/views.py
Simple merge