Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
javascript and openid-selector with HEAD of master-da.
|
|
with HEAD of master-da.
|
|
|
|
|
|
templates to sync with HEAD of master (not master-nb: switch later).
|
|
templates to sync with HEAD of master (not master-da: switch later).
|
|
|
|
|
|
|
|
Conflicts (override with HEAD of submodules):
basewiki
templates
|
|
Conflicts (override with HEAD of submodules):
basewiki
templates
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved: merge old and new parts):
.gitmodules
|
|
|
|
|
|
in danish po of basewiki and templates.
|
|
signin=registrér/notér (not log på).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|