projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63352aa a45631e)
Merge branch 'master' into sqlmigrate
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Feb 2012 21:33:29 +0000 (15:33 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Feb 2012 21:33:29 +0000 (15:33 -0600)
1  2 
mediagoblin/db/sql/models.py patch | diff1 | diff2 | blob | history

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