Merge branch 'dev-master' into dev-3.x

yui · Oct 22, 2014 · c0858c2 · c0858c2
2 parents b5ca75d + 25264e3
commit c0858c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "yui",
-  "version": "3.18.1",
+  "version": "3.18.2-pre",
   "main": "build/yui/yui.js",
   "devDependencies": {
     "pure": "0.4.2"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "yui",
-    "version": "3.18.1",
+    "version": "3.18.2-pre",
     "description": "YUI 3 Source",
     "author": "Dav Glass <davglass@gmail.com>",
     "bugs": { "url" : "https://github.com/yui/yui3/issues" },