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

master
Joey Hess 2012-05-24 16:33:15 -04:00
commit 41aee34274
7 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://ismael.olea.org/"
ip="150.214.94.198"
subject="comment 2"
date="2012-05-22T21:24:37Z"
content="""
Gosh, that was it.
Grrr. Sorry for being too rookie O:-)
Thanks!
"""]]

View File

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://ismael.olea.org/"
ip="150.214.94.198"
subject="comment 1"
date="2012-05-22T23:31:09Z"
content="""
Can be adminuser an OpenID address?
Because I can't get the websetup link at my preferences (plugin is set). I deactivated passwordauth plugin.
"""]]

View File

@ -185,3 +185,6 @@ This is simple enough for now [[sandbocen]] no?
test by max
test by bbb
Can I make a [[NewPage]]?

View File

@ -0,0 +1 @@
This page uses directory hierarchies. Good.

View File

@ -65,4 +65,4 @@ The plugin can be downloaded from <http://ikiwiki.xbaud.com/wikiwyg-1.6.tar.gz>
>> Seems the new place is now at Github: <https://github.com/audreyt/wikiwyg-js>
>> FYI
>> --[[Olea]]
>> --[[users/Olea]]

View File

@ -178,4 +178,4 @@ Thanks, [[Greg]]
>>> screwed up pushing the branch. :-( --[[Joey]]
>>>> Seems the new place is now at Github: <https://github.com/audreyt/wikiwyg-js>
>>>> FYI
>>>> --[[Olea]]
>>>> --[[users/Olea]]