Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
basewiki
ikiwiki_nb.setup
ikiwiki_nb_admin.setup
smiley
templates
|
|
Conflicts (manually resolved):
basewiki_nonedit
templates_nonedit
|
|
ikiwiki_LL_admin.setup.
|
|
|
|
|
|
Conflicts (resolved manually):
.gitmodules
basewiki_da
basewiki_nb
ikiwiki_da.setup
ikiwiki_nb.setup
templates_da
templates_nb
|
|
trailing _LL (not _l10n/LL) for add-on languages.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts (manually resolved):
basewiki_nonedit
templates_nonedit
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ikiwiki_LL.setup.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ikiwiki_da_admin.setup.
|
|
ikiwiki_nb_admin.config.
|
|
Conflicts (resolve manually):
ikiwiki_nb.setup
|
|
Conflicts (resolved manually):
ikiwiki_da.setup
|
|
gitignore them.
|
|
|
|
|
|
|