projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae72c63 758eb74)
Merge remote branch 'remotes/elrond/dev/storage_config'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 21 Aug 2011 18:51:05 +0000 (13:51 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 21 Aug 2011 18:51:05 +0000 (13:51 -0500)
1  2 
mediagoblin/storage.py patch | diff1 | diff2 | blob | history

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