From a6e521bb9d7e9fd422f8a1708f5609fc671b4fd7 Mon Sep 17 00:00:00 2001
From: heycalmdown <heyacct@gmail.com>
Date: Sat, 22 Apr 2017 18:02:09 +0900
Subject: [PATCH] 1.4.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b7083ce..faaf315d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/heycalmdown/miniseminar/compare/v1.3.0...v1.4.0) (2017-04-22)
+
+
+### Bug Fixes
+
+* **package:** update confluency to version 0.5.0 ([dd028a5](https://github.com/heycalmdown/miniseminar/commit/dd028a5))
+
+
+### Features
+
+* **plugin:** add mermaid support ([1a4abb9](https://github.com/heycalmdown/miniseminar/commit/1a4abb9)), closes [#15](https://github.com/heycalmdown/miniseminar/issues/15)
+* **plugin:** p and img also can be fragmented ([546378f](https://github.com/heycalmdown/miniseminar/commit/546378f)), closes [#20](https://github.com/heycalmdown/miniseminar/issues/20) [#21](https://github.com/heycalmdown/miniseminar/issues/21)
+
+
+
 <a name="1.3.0"></a>
 # [1.3.0](https://github.com/heycalmdown/miniseminar/compare/v1.2.0...v1.3.0) (2017-03-14)
 
diff --git a/package.json b/package.json
index 9ab0ac40..181304cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "miniseminar",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "private": true,
   "scripts": {
     "start": "node ./bin/www",