]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'smcv/beautify'
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 27 Sep 2008 17:00:48 +0000 (13:00 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 27 Sep 2008 17:00:48 +0000 (13:00 -0400)
Conflicts:

IkiWiki/Plugin/recentchanges.pm

Note that smcv's approach of using urlto also gets the url right when
redirecting to a non-html file, which is a better approach than my recent
fix to recentchanges

1  2 
IkiWiki/Plugin/editpage.pm
IkiWiki/Plugin/recentchanges.pm
IkiWiki/Plugin/remove.pm

Simple merge
Simple merge
Simple merge