Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2010-01-18 18:00:21 -05:00
commit 604afbedd3
1 changed files with 4 additions and 0 deletions

View File

@ -54,3 +54,7 @@ and a whitelist of OpenIDs in `locked_pages`...)
>>>>>> change. And then the Edit link for Discussion subpages could do
>>>>>> as you suggest, adding one click for the httpauth user, who won't
>>>>>> often need to edit those subpages. --[[schmonz]]
>> On reflection, I've stopped being bothered by the
>> redirect-to-signin-page approach. (It only needs to happen once per
>> browser session, anyway.) Can we try that? --[[schmonz]]