Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (suppressed):
templates
|
|
|
|
|
|
|
|
Conflicts (changes suppressed):
basewiki
|
|
|
|
Conflicts (suppress changes):
basewiki
templates
|
|
Conflicts (sync submodules with HEAD of allinone):
basewiki
|
|
(not scs: switch later).
|
|
(not clean switch later).
|
|
Conflicts (suppressed):
basewiki
templates
|