projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da77b8e 8b8698e)
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
authorjpope <jpope@jpope.org>
Mon, 6 Jan 2014 02:56:28 +0000 (20:56 -0600)
committerjpope <jpope@jpope.org>
Mon, 6 Jan 2014 02:56:28 +0000 (20:56 -0600)
Conflicts:
.gitmodules
mediagoblin/static/css/base.css


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.