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