Merges are not noteworthy

2014-02-28 20:03:06 -07:00 · 2014-02-28 20:03:06 -07:00 · 292299d43c
commit 292299d43c
parent db5cccc70f
1 changed files with 0 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -57,9 +57,6 @@
 **ParrotParrot**:
 - Added `Original filename` variable to Sauce panel.

-**Zixaphir**:
- Merge changes from Mayhem fork
-
 ### v1.3.9 
 *2014-02-20*