Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a55752a
50c7ddb
)
Merge remote-tracking branch 'spalax/paternal/upload-svg'
author
Simon McVittie
<smcv@debian.org>
Fri, 12 Sep 2014 20:41:45 +0000
(21:41 +0100)
committer
Simon McVittie
<smcv@debian.org>
Fri, 12 Sep 2014 20:41:45 +0000
(21:41 +0100)
1
2
doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
Simple merge