projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2a9f519
b3b42bb
)
Merge remote-tracking branch 'refs/remotes/merge-requests/40'
author
Christopher Allan Webber
<cwebber@dustycloud.org>
Sun, 19 Aug 2012 17:14:39 +0000
(12:14 -0500)
committer
Christopher Allan Webber
<cwebber@dustycloud.org>
Sun, 19 Aug 2012 17:14:39 +0000
(12:14 -0500)
1
2
mediagoblin/templates/mediagoblin/admin/panel.html
patch
|
diff1
|
diff2
|
blob
|
history
mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mediagoblin/templates/mediagoblin/admin/panel.html
Simple merge
diff --cc
mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
Simple merge
projects / mediagoblin.git / commitdiff