Merge remote branch 'upstream/master' into prv/po

[git.ikiwiki.info.git] / po / underlay.setup

diff --git a/po/underlay.setup b/po/underlay.setup
index c340459819d914d7f6cc452a91d016e806dca47d..8d3516cff14a789341e25ae6c08d56feb397809e 100644 (file)
--- a/po/underlay.setup
+++ b/po/underlay.setup
@@ -24,6 +24,7 @@ use IkiWiki::Setup::Standard {
        # we don't want to pull in the normal underlays
        underlaydirbase => "underlays/empty",
        underlaydir => "underlays/empty",
        # we don't want to pull in the normal underlays
        underlaydirbase => "underlays/empty",
        underlaydir => "underlays/empty",

+       disable_plugins => [qw{openid}], # needs special underlay

        discussion => 0,
        locale => '',
        verbose => 1,
        discussion => 0,
        locale => '',
        verbose => 1,