diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-03-29 12:18:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-03-29 12:18:09 -0400 |
| commit | b0411319009237c4aea48de78945388d019fc21c (patch) | |
| tree | 9e91bbd8b9423c25ea1fd2a5937628a77e5869dd /doc/todo | |
| parent | 97898ce585b36dbcb0a83356ef3e54c41d369437 (diff) | |
| parent | 263d9548969dcdf9a6add96f46fe03ba7701a1ca (diff) | |
| download | ikiwiki-b0411319009237c4aea48de78945388d019fc21c.tar ikiwiki-b0411319009237c4aea48de78945388d019fc21c.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:
doc/todo/allow_site-wide_meta_definitions.mdwn
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/allow_site-wide_meta_definitions.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index e4638f94b..704cb2c64 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -212,6 +212,9 @@ definitions essentially. >>> 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]] +>>>> Ping :) Hi. [[Joey]], would you consider this patch for the next +>>>> ikiwiki release? -- [[Jon]] + >>> For this to work with websetup and --dumpsetup, it needs to define the >>> `meta_*` settings in the getsetup function. >>> |