projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4225a67 6fc8af3)
Merge branch 'mediagoblin-upstream' into feature544_basic_license_data
authorAaron Williamson <aaron@copiesofcopies.org>
Thu, 19 Jan 2012 01:40:18 +0000 (20:40 -0500)
committerAaron Williamson <aaron@copiesofcopies.org>
Thu, 19 Jan 2012 01:40:18 +0000 (20:40 -0500)
1  2 
mediagoblin/submit/views.py patch | diff1 | diff2 | blob | history

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