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

Merge remote-tracking branch 'origin/master'

master
Simon McVittie 2015-11-30 21:02:07 +00:00
parent 72c3b81efb d59459c772
commit 782a2e016b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/todo/Option_linktext_for_pagestats_directive.mdwn
View File

@ -201,3 +201,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/pagest
>> Here's a branch. It depends on my `ready/limit` branch
>> from [[todo/pick a new canonical name for equivalent of SQL limit]].
>> --[[smcv]]
>>> [[Merged|done]] --[[smcv]]

2
doc/todo/pick_a_new_canonical_name_for_equivalent_of_SQL_limit.mdwn
View File

@ -42,3 +42,5 @@ browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/
I personally prefer `\[[!inline limit=10]]` so I have put that in a branch.
Agreement/objections/better ideas welcome. --[[smcv]]
> In the absence of any feedback I've applied that branch. [[done]] --[[smcv]]