upgrade to 1.15

NetEase · Feb 26, 2015 · f8fe4ed · f8fe4ed
1 parent 31d21a3
commit f8fe4ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,6 @@
+1.1.5 / 2015-02-26
+=================
+  * [NEW] upgrade pomelo-rpc to 0.4.7
 1.1.4 / 2015-01-23
 =================
   [#670](https://github.com/NetEase/pomelo/pull/670)

diff --git a/lib/pomelo.js b/lib/pomelo.js
@@ -24,7 +24,7 @@ var Pomelo = module.exports = {};
  * Framework version.
  */
 
-Pomelo.version = '1.1.4';
+Pomelo.version = '1.1.5';
 
 /**
  * Event definitions that would be emitted by app.event

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomelo",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "private": false,
   "homepage": "https://github.com/NetEase/pomelo",
   "repository": {