From 1be94897f9abe727c0e77abc636c3aa74ac64665 Mon Sep 17 00:00:00 2001
From: Kris Kowal <kris.kowal@cixar.com>
Date: Sat, 9 May 2015 09:23:42 -0700
Subject: [PATCH] Update changelog for v1.4.0

---
 CHANGES.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1fa4a017..64650b50 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,7 @@
-<!-- vim:ts=4:sts=4:sw=4:et:tw=70 -->
+
+## 1.4.0
+
+ - Add `noConflict` support for use in `<script>` (@jahnjw).
 
 ## 1.3.0