projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
491dd3f
b5cc7af
)
Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin
author
Joar Wandborg
<git@wandborg.com>
Sat, 28 May 2011 21:52:00 +0000
(23:52 +0200)
committer
Joar Wandborg
<git@wandborg.com>
Sat, 28 May 2011 21:52:00 +0000
(23:52 +0200)
1
2
mediagoblin/templates/mediagoblin/base.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mediagoblin/templates/mediagoblin/base.html
Simple merge
projects / mediagoblin.git / commitdiff