projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b31269d 49fca84)
Merge remote branch 'remotes/j1mc/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 1 Nov 2011 04:42:12 +0000 (23:42 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 1 Nov 2011 04:42:12 +0000 (23:42 -0500)
1  2 
docs/source/configuration.rst patch | diff1 | diff2 | blob | history

diff --cc docs/source/configuration.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.