projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55a04f0 dc4dfbd)
Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 22 Jan 2013 19:43:02 +0000 (13:43 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 22 Jan 2013 19:43:02 +0000 (13:43 -0600)
1  2 
mediagoblin/edit/views.py patch | diff1 | diff2 | blob | history
mediagoblin/submit/views.py patch | diff1 | diff2 | blob | history
mediagoblin/templates/mediagoblin/edit/edit_account.html patch | diff1 | diff2 | blob | history

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