projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d6a905 d71170a)
Merge remote branch 'remotes/jwandborg/configure_smtp'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 27 Aug 2011 17:00:54 +0000 (12:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 27 Aug 2011 17:00:54 +0000 (12:00 -0500)
1  2 
mediagoblin/config_spec.ini patch | diff1 | diff2 | blob | history
mediagoblin/util.py patch | diff1 | diff2 | blob | history

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