Age | Commit message (Collapse) | Author |
|
|
|
Conflicts (manually resolved: merge old and new parts):
.gitmodules
|
|
|
|
in danish po of basewiki and templates.
|
|
signin=registrér/notér (not log på).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ikiwiki_nb_admin.config.
|
|
Conflicts (resolve manually):
ikiwiki_nb.setup
|
|
gitignore them.
|
|
|
|
Conflicts:
basewiki
templates
|
|
Conflicts:
basewiki
templates
|
|
|
|
|