Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolve):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (suppress changes):
templates
|
|
|
|
|
|
|
|
Conflicts (suppress changes):
basewiki
|
|
|
|
Conflicts (suppress changes):
basewiki
templates
|
|
Conflicts (suppress changes):
basewiki
|
|
Conflicts (sync submodules with HEAD of allinone-da):
basewiki
smiley
templates
|
|
(not scs: switch later).
|
|
templates to sync with HEAD of master (not master-da: switch later).
|
|
(not clean switch later).
|
|
Conflicts (changes suppressed):
basewiki
templates
|
|
Conflicts (override with HEAD of submodules):
basewiki
templates
|
|
Conflicts:
basewiki
templates
|
|
|