diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 16:37:13 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 16:37:13 +0200 |
| commit | b3d2834adf1721f687c57ab67356794db86c51c6 (patch) | |
| tree | 72f1a433c15d863857841c828d149bb135d531ca /recentchanges.mdwn | |
| parent | da47e211683a1b709cbe06d3cacaefa7e57c1f2a (diff) | |
| parent | 0672078ec374131d707ad62f4cadac26ea024841 (diff) | |
Merge branch 'clean' into allinone-nonedit
Conflicts (manually resolved: text adjustments adopted, newly added files suppressed):
ikiwiki.mdwn
ikiwiki/directive.mdwn
ikiwiki/formatting.mdwn
ikiwiki/markdown.mdwn
ikiwiki/openid.mdwn
ikiwiki/pagespec.mdwn
ikiwiki/pagespec/attachment.mdwn
ikiwiki/subpage.mdwn
ikiwiki/wikilink.mdwn
index.mdwn
templates.mdwn
wikiicons/openidlogin-bg.gif
Diffstat (limited to 'recentchanges.mdwn')
0 files changed, 0 insertions, 0 deletions