summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-03 16:22:42 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-03 16:22:42 +0200
commit289cd73b5cc44bcc69ad693ddeba07b807d9a349 (patch)
treea72325459549c5c1cb057fdaa592cc790e5f5db3 /Makefile
parent3f6c6012b240be3c4286912ad5a065821d883fbf (diff)
parentbd56e079facdecce4acc8dd7cc15c702f05547b7 (diff)
Merge branch 'da' into _multilang
Conflicts (manually resolved): ikiwiki_da.setup
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions