From 8cb4c0445cab2c472f99cf0f503962136fea6420 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 13 Apr 2016 15:47:40 -0700
Subject: Add merge to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5206c1684..83c0f1709 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Current Master
 
 - Corrected text above account list. Selected account is visible to all sites, not just the current domain.
+- Merged the UI codebase into the main plugin codebase for simpler maintenance.
 
 ## 1.5.0 2016-04-13
 
-- 
cgit v1.2.3