projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b74ce9 4d7a93a)
Fixed conflict in /auth/views.py.
authorAaron Williamson <aaron@copiesofcopies.org>
Tue, 4 Oct 2011 00:01:14 +0000 (20:01 -0400)
committerAaron Williamson <aaron@copiesofcopies.org>
Tue, 4 Oct 2011 00:01:14 +0000 (20:01 -0400)
1  2 
mediagoblin/auth/views.py patch | diff1 | diff2 | blob | history

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