Age | Commit message (Collapse) | Author |
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
|
|
It is indeed needed for templates.
This reverts commit e35add35a02e84a99b83a4090870ac634e344ca6.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge '_nb' branch, but re-add dropped ikiwiki.setup, to only add (not
rename) nb variant.
|
|
Merge an early snapshot of 'da' branch, but revert Makefile changes,
and re-add dropped ikiwiki.setup, to only add (not rename) da variant.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|