urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2010-01-07 15:10:29 -05:00
parent a250a55baa 436e297310
commit db44ee6ed0
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/ikiwikiusers.mdwn
View File

@ -49,6 +49,7 @@ Projects & Organizations
* [Tinc VPN](http://tinc-vpn.org/) * [Tinc VPN](http://tinc-vpn.org/)
* [The XCB library](http://xcb.freedesktop.org/) * [The XCB library](http://xcb.freedesktop.org/)
* [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/) * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
* [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
Personal sites and blogs Personal sites and blogs
======================== ========================

1
doc/sandbox.mdwn
View File

@ -74,3 +74,4 @@ bar
[[!toggle id="foobar" text="foo/bar"]] [[!toggle id="foobar" text="foo/bar"]]
Hmm, can I dig it?

5
doc/todo/allow_site-wide_meta_definitions.mdwn
View File

@ -178,3 +178,8 @@ definitions essentially.
* title * title
-- [[Jon]] -- [[Jon]]
>>> Merry Christmas/festive season/happy new year folks. I've been away from
>>> ikiwiki for the break, and now I've returned to watching recentchanges.
>>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
>>> you had a chance to look at this yet? -- [[Jon]]