diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 23:22:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-26 23:22:42 -0400 |
| commit | 4ef96e2d9994c407f0f2f46301eb91fab6b48a37 (patch) | |
| tree | 776e011ceeac1c0bc3f2aa1d7c374c1a6919d21c /debian | |
| parent | 7a2a235fa45d84e4a5f3f6bb3b5059d08939cddc (diff) | |
| parent | ecc40d1769c84a2cca3070e848adfd8710f27d8b (diff) | |
| download | ikiwiki-4ef96e2d9994c407f0f2f46301eb91fab6b48a37.tar ikiwiki-4ef96e2d9994c407f0f2f46301eb91fab6b48a37.tar.gz | |
Merge branch 'master' into autoconfig
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/copyright | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 78a18b615..08be87fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ ikiwiki (2.55) UNRELEASED; urgency=low * toggle: Fix incompatability between javascript and webkit. * bzr: Add support for rename and delete. (Jelmer Vernooij) * attachment: Use relative paths when inserting links. + * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini) + * cutpaste: New plugin by Enrico Zini -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400 diff --git a/debian/copyright b/debian/copyright index d25e0861a..d22edb03b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -76,7 +76,7 @@ Files: htmltidy.pm Copyright: © 2006 Faidon Liambotis License: GPL-2+ -Files: polygen.pm, pagestats.pm +Files: polygen.pm, pagestats.pm, cutpaste.pm Copyright: © 2006 Enrico Zini License: GPL-2+ |