Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
|
|
Conflicts (manually resolve):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
smiley
|
|
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
.gitmodules
ikiwiki_nb.setup
|
|
Conflicts (manually resolved):
.gitmodules
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (suppress changes):
templates
templates_nonedit
|
|
Conflicts (suppress changes):
templates
templates_nonedit
|
|
|