From f24af233ec810fc3be5d3c36df422ae801fd527c Mon Sep 17 00:00:00 2001
From: life <lealife@outlook.com>
Date: Sun, 10 May 2015 23:49:48 +0800
Subject: [PATCH] 0.5.2 released

---
 .gitignore       | 4 +++-
 src/data/version | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14e9c205..e60e7755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ sqlite*
 /test
 tinymce_old
 src/node_modules/request
+src/node_modules/fs.extra
+src/merge.js
 src/test*.js
 /updates
-/old
\ No newline at end of file
+/old
diff --git a/src/data/version b/src/data/version
index a452cb5b..fd99c936 100644
--- a/src/data/version
+++ b/src/data/version
@@ -1 +1 @@
-{"version":"electron-0.5","updatedTime":"2015-03-24T07:11:51.505Z"}
\ No newline at end of file
+{"version":"electron-0.5.2","updatedTime":"2015-03-24T07:11:51.505Z"}
\ No newline at end of file