Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
Conflicts (manually resolve):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
templates to sync with HEAD of master (not master-da: switch later).
|
|
Conflicts (override with HEAD of submodules):
basewiki
templates
|
|
|
|
|
|
|
|
in danish po of basewiki and templates.
|
|
signin=registrér/notér (not log på).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
multi-layered Gits).
|
|
gitignore them.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
It is indeed needed for templates.
This reverts commit e35add35a02e84a99b83a4090870ac634e344ca6.
|
|
|
|
|
|
|