Commit Graph

4 Commits (d3ad47829871a52c622fcb918251f72f11fec0a5)

Author SHA1 Message Date
Joey Hess b2d7bbb922 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:

	doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
2008-08-25 20:51:45 -04:00
Joey Hess d06096ad0d edittemplate: Don't wipe out edits on preview. 2008-08-25 20:51:10 -04:00
JoeRayhawk b8c8201876 Signing 2008-08-25 20:29:39 -04:00
JoeRayhawk 3c542cc279 Bug: previewing with an edittemplate reverts edit box 2008-08-25 20:27:00 -04:00