diff options
| author | Joey Hess <joey@kitenet.net> | 2010-10-04 15:59:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-04 15:59:45 -0400 |
| commit | 252e3f600670040b2a184e5ca0581db720096a80 (patch) | |
| tree | e3aba59de58b5ba69d80d4093538ea8a93893cf2 /doc | |
| parent | c76909d035effd8050081e43736c570372d36c10 (diff) | |
| parent | ab9d6bae95821a117642ef96e708a26b2ad9953b (diff) | |
| download | ikiwiki-252e3f600670040b2a184e5ca0581db720096a80.tar ikiwiki-252e3f600670040b2a184e5ca0581db720096a80.tar.gz | |
Merge remote branch 'remotes/peteg/revert' into revert
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/templates.mdwn | 2 | ||||
| -rw-r--r-- | doc/wikiicons/revert.png | bin | 0 -> 840 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/templates.mdwn b/doc/templates.mdwn index bfb6a439a..4fd2bf501 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -74,7 +74,7 @@ html out of ikiwiki and in the templates. * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user + `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need to be customised. [[!meta robots="noindex, follow"]] diff --git a/doc/wikiicons/revert.png b/doc/wikiicons/revert.png Binary files differnew file mode 100644 index 000000000..9036046e9 --- /dev/null +++ b/doc/wikiicons/revert.png |
