diff options
| author | Joey Hess <joey@kitenet.net> | 2008-09-05 14:01:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2008-09-05 14:01:12 -0400 |
| commit | dd349d69ea2361360b4534d9c77806345ff490ad (patch) | |
| tree | 5858da519b35151b5b04bc005550608d5b0bcb2c /IkiWiki.pm | |
| parent | e79e3143509d3f4c0273e8eed5956d264cbc56e2 (diff) | |
| parent | 0f67e7d96953535e98d9ec26c30a25b8aaad782c (diff) | |
Merge branch 'master' of file:///srv/git/ikiwiki.info
Conflicts:
doc/todo/page_edit_disable.mdwn
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 7553ae3db..01798941c 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -121,7 +121,7 @@ sub getsetup () { #{{{ type => "internal", default => [qw{mdwn link inline htmlscrubber passwordauth openid signinedit lockedit conditional - recentchanges parentlinks}], + recentchanges parentlinks editpage}], description => "plugins to enable by default", safe => 0, rebuild => 1, |