diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /templates | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editcomment.tmpl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl index 27d9457d4..545edb596 100644 --- a/templates/editcomment.tmpl +++ b/templates/editcomment.tmpl @@ -16,7 +16,6 @@ Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br /> Subject: <TMPL_VAR FIELD-SUBJECT><br /> <TMPL_VAR FIELD-EDITCONTENT><br /> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br /> -IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br /> <TMPL_VAR NAME="FORM-END"> <TMPL_VAR WMD_PREVIEW> |