diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:37:53 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:37:53 +0200 |
| commit | 9ab5423ae14b45d83ba691e0450035baa5173b1c (patch) | |
| tree | 9037be9f739170da6262a053894496ab41b8dfe0 | |
| parent | d520affc3f284e2803ee9057040fb66dae524b82 (diff) | |
| parent | fcf61c458aca48c32602d20a3826cf04c3bda7dd (diff) | |
Merge branch '_da' into allinone-da
Conflicts (manually resolved):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 225d3cf..01764e7 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -29,7 +29,8 @@ use IkiWiki::Setup::Standard { # rcs backend to use rcs => 'git', # plugins to add to the default configuration - add_plugins => [], + add_plugins => [qw{ + }], # plugins to disable disable_plugins => [qw{ editpage |