Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
It is indeed needed for templates.
This reverts commit e35add35a02e84a99b83a4090870ac634e344ca6.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|