Age | Commit message (Collapse) | Author |
|
|
|
Conflicts (manually solved):
ikiwiki/blog.mdwn
recentchanges.mdwn
templates.mdwn
Also translated the following:
ikiwiki/pagespec/attachment.mdwn
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
master-da
|
|
|
|
|
|
debian@coreander:/srv/git/source.jones.dk/ikiwiki_basewiki into scs
|
|
|
|
|
|
|
|
Origin: http://www.thenoodleincident.com/tutorials/typography/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|