projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1e298b1
64eab63
)
Merge remote-tracking branch 'upstream/master' into skeletongobblin
author
jpope
<jpope@jpope.org>
Sun, 5 Jan 2014 22:55:58 +0000
(16:55 -0600)
committer
jpope
<jpope@jpope.org>
Sun, 5 Jan 2014 22:55:58 +0000
(16:55 -0600)
1
2
mediagoblin/templates/mediagoblin/base.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mediagoblin/templates/mediagoblin/base.html
Simple merge