Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
|
|
Conflicts (manually resolved):
Makefile
smiley
|
|
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
|
|
|
|
|
|
|
|
|
|
|
|
|
|
trailing _LL (not _l10n/LL) for add-on languages.
|
|
ikiwiki_LL.setup.
|
|
Conflicts (resolve manually):
ikiwiki_nb.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
ikiwiki_nb_admin.setup
|
|
Conflicts (manually resolved):
.gitignore
ikiwiki.setup
ikiwiki_da.setup
ikiwiki_nb.setup
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
|
|
Conflicts (manually resolved):
ikiwiki.setup
|
|
Conflicts (manually resolved):
ikiwiki_nb_admin.setup
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
(Changes to Makefile suppressed)
|
|
|
|
Conflicts (manually resolved):
ikiwiki_nb.setup
Also, use nb setup files in Makefile.
|