Age | Commit message (Collapse) | Author |
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
smiley
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
.gitignore
ikiwiki.setup
ikiwiki_da.setup
ikiwiki_nb.setup
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
Also, examplewiki -> samplewiki applied to admin setup too.
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
(newly added monotone hook stripped too)
|
|
|
|
|
|
|
|
|