projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5cdd74 42ce372)
Merge remote-tracking branch 'refs/remotes/merge-requests/47'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 16:23:36 +0000 (11:23 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 16:23:36 +0000 (11:23 -0500)
1  2 
docs/source/siteadmin/relnotes.rst patch | diff1 | diff2 | blob | history
mediagoblin.ini patch | diff1 | diff2 | blob | history

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