projects / mediagoblin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a0a308 2949798)
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 22 Oct 2012 16:07:01 +0000 (11:07 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 22 Oct 2012 16:07:01 +0000 (11:07 -0500)
commitd7d9933735d7a0b4339e1a4e6bebe169ba9f4f9a
tree2020a6752553090f9bca8508fd1d5cb04dfac6catree | snapshot (zip tar.gz)
parent7a0a308fe8571b027284c1e91c47fd468f40863fcommit | diff
parent294979824c2eb651168c66f58e1d759a2ff56adacommit | diff
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
mediagoblin/templates/mediagoblin/user_pages/user.html diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.