diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:46:41 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:47:40 +0200 |
| commit | a3a014542bddda8ba54f45078232cceeadfa505b (patch) | |
| tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /basewiki | |
| parent | 732fe48592a0f89c572c19f87314f43f6502bcb7 (diff) | |
| parent | 845babe7307e76ce905d45dd74a14dcd3d67cecb (diff) | |
Merge branch 'nb' into _multilang
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
Diffstat (limited to 'basewiki')
| m--------- | basewiki | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/basewiki b/basewiki -Subproject 320795e6d83f5d9fa2fefdcdd3f28cf1033243b +Subproject 6b53960c5bbcf6a43f2e48b0b37a94e1f909b52 |