Merge branch 'v3'

2013-08-05 14:41:13 -07:00 · 2013-08-05 14:41:13 -07:00 · 9c834f6d76
commit 9c834f6d76
parent ae9b197d3f 548bbdd84a
1 changed files with 1 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -15,6 +15,7 @@
 **Zixaphir**:
 - Linkifier Rewrite.
 - Fix Quote Threading toggle.
+- Added Twitch.tv and Vine embedding (with @ihavenoface)
 - Minor optimizations.
 - Minor fixes.