diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:38:28 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:38:28 +0200 |
| commit | 809ac229c56b6f7cdec73c9310f95a9338ce90df (patch) | |
| tree | f89d60406978f22322899956d01ba3fc7475d0e5 | |
| parent | 6b749c44e951142b63f2ef89ae8adda972406554 (diff) | |
| parent | da42773f4e4efc56f4233dbe5fb5d8070bf632fb (diff) | |
Merge branch '_nb' into allinone-nb
Conflicts (manually resolved):
ikiwiki_nb.setup
| -rw-r--r-- | ikiwiki_nb.setup | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index f60655b..c00e251 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.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 |