summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 20:37:00 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 20:37:00 +0200
commit5045a055d80c8d1147e893dbf59fd9590fd21318 (patch)
treee58445bfce86014ade93b334664612c445890dfe /Makefile
parenta512a752158af238812625c2c482f518ac7927a2 (diff)
parentcba18592fa1db4c492cb99b29dfa8e23edee0f84 (diff)
Merge branch 'nb' into _multilang
Conflicts (manually resolved): ikiwiki_nb.setup
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions