projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4edbfd 51b4318)
Merge remote-tracking branch 'spaetz/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 28 Sep 2013 18:32:11 +0000 (13:32 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 28 Sep 2013 18:32:11 +0000 (13:32 -0500)
1  2 
mediagoblin/user_pages/views.py patch | diff1 | diff2 | blob | history

diff --cc mediagoblin/user_pages/views.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.