From 5b7b128b9cd3b21e04c34035fbbdf885ba7a6025 Mon Sep 17 00:00:00 2001
From: luckyadam <weitaozsh@gmail.com>
Date: Mon, 9 May 2016 15:10:44 +0800
Subject: [PATCH] Release 1.0.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d869ec..c8fcc83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # ChangeLog
 
+## 1.0.4
+
+* update:优化client模式编译步骤，合并重复操作
+* fix:清除发布缓存不传参数无法删除缓存
+* fix:远程加载组件回传参数
+* fix:上传后列表中图片地址，多级目录被展开，同时过滤列表中html文件
+* update:combo-use标记增加总控制
+* update:优化serve时文件修改反馈
+* update:模板中文别名，提高模板辨识度
+
 ## 1.0.3
 
 * update:增加加载远程组件功能
diff --git a/package.json b/package.json
index c2380a5..c405846 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "athena-html",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "O2前端流程工具",
   "main": "index.js",
   "scripts": {