projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 200433d 5c99cd0)
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorMike Linksvayer <ml@gondwanaland.com>
Thu, 20 Dec 2012 20:50:43 +0000 (12:50 -0800)
committerMike Linksvayer <ml@gondwanaland.com>
Thu, 20 Dec 2012 20:50:43 +0000 (12:50 -0800)
Conflicts:
docs/source/siteadmin/media-types.rst

1  2 
mediagoblin.ini patch | diff1 | diff2 | blob | history

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