Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
Conflicts:
blueview/style.css
default/_ikiwiki.scss
goldtype/style.css
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ikiwiki-site in ikiwiki-style.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (resolved manually: apply default/_ikiwiki.scss, suppress rest):
actiontabs/style.css
blueview/style.css
default/_ikiwiki.scss
goldtype/style.css
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Makefile
blueview/style.scss
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
actiontabs/style.css
blueview/style.css
default/_ikiwiki.scss
|
|
|
|
|
|
|
|
|