summaryrefslogtreecommitdiff
path: root/smiley
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 19:46:41 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 19:47:40 +0200
commita3a014542bddda8ba54f45078232cceeadfa505b (patch)
tree9cc54a88d5b57212b420625417f085d0706e4cbb /smiley
parent732fe48592a0f89c572c19f87314f43f6502bcb7 (diff)
parent845babe7307e76ce905d45dd74a14dcd3d67cecb (diff)
Merge branch 'nb' into _multilang
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates
Diffstat (limited to 'smiley')
0 files changed, 0 insertions, 0 deletions