aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/htmlscrubber.pm2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index a58a27d52..b22d3aa9e 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -28,7 +28,7 @@ sub import {
"aim", "callto", "cvs", "ed2k", "feed", "fish", "gg",
"irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
"msnim", "notes", "rsync", "secondlife", "skype", "ssh",
- "sftp", "smb", "sms", "snews", "webcal", "ymsgr",
+ "sftp", "smb", "sms", "snews", "webcal", "ymsgr", "bitcoin"
);
# data is a special case. Allow a few data:image/ types,
# but disallow data:text/javascript and everything else.
diff --git a/debian/changelog b/debian/changelog
index 51ce353d5..abc40a163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20121213) UNRELEASED; urgency=low
+
+ * htmlscrubber: Allow the bitcoin URI scheme.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 22 Dec 2012 16:15:24 -0400
+
ikiwiki (3.20121212) unstable; urgency=low
* filecheck: Fix bug that prevented File::MimeInfo::Magic from ever