Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
visible breakage).
|
|
Conflicts (manually resolved):
ikiwiki_da_admin.setup
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_da_admin.setup
|
|
|
|
Conflicts (manually resolved):
ikiwiki.setup
Also, examplewiki -> samplewiki applied to admin setup too.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
ikiwiki_da.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
Makefile
|
|
|
|
Conflicts (manually resolved):
Makefile
|