Merge remote-tracking branch 'template/master'

nkbt · Oct 8, 2015 · d863c87 · d863c87
2 parents 188c52f + f07cfc0
commit d863c87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,12 +1,11 @@
 machine:
   node:
-    version: v0.10.38
+    version: v0.10.40
 
 
 dependencies:
   pre:
-    - npm update -g npm
-    - npm install react@0.13
+    - npm update -g npm@3
 
 test:
   override:

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
   },
   "homepage": "https://github.com/nkbt/react-copy-to-clipboard",
   "peerDependencies": {
-    "react": "^0.13 || ~0.14.0-beta || ~0.14.0-rc"
+    "react": "^0.13 || ^0.14"
   },
   "dependencies": {
     "copy-to-clipboard": "^1.0.4"
@@ -78,6 +78,7 @@
     "node-libs-browser": "^0.5.3",
     "parallelshell": "^2.0.0",
     "phantomjs": "^1.9.18",
+    "react": "^0.14.0",
     "react-hot-loader": "^1.3.0",
     "rimraf": "^2.4.3",
     "tap-xunit": "^1.2.1",