summaryrefslogtreecommitdiff
path: root/javascript
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-30 20:31:14 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-30 20:31:14 +0200
commit41acfd89e07e6395d609f84118feec164186b763 (patch)
treec4ca13e11a17c07edf434a144409bc9d8233da23 /javascript
parent1d5c9884c77eff35645a0c2569d285b9c56569d6 (diff)
parent81d6a832dc0590cf38d6ca05ed092e8d97ce49f6 (diff)
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved): ikiwiki_da_admin.setup
Diffstat (limited to 'javascript')
0 files changed, 0 insertions, 0 deletions