projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1df68a3 914b8bc)
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 10 Jan 2012 14:12:30 +0000 (08:12 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 10 Jan 2012 14:12:30 +0000 (08:12 -0600)
Conflicts:
mediagoblin/db/mongo/models.py

1  2 
mediagoblin/db/mongo/models.py patch | diff1 | diff2 | blob | history

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