projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8aa18b6 86bd1f3)
Merge remote-tracking branch 'remotes/npigeon/ticket-601'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 20 Apr 2013 22:19:56 +0000 (17:19 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 20 Apr 2013 22:19:56 +0000 (17:19 -0500)
1  2 
mediagoblin/config_spec.ini patch | diff1 | diff2 | blob | history

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