Merge pull request #20 from canjs/merge-master-to-major

Merge master to major
canjs · Nov 10, 2017 · 4e19b1d · 4e19b1d
2 parents 9eedd6e + 6cce6b5
commit 4e19b1d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/can-reflect-promise.md b/can-reflect-promise.md
@@ -1,5 +1,6 @@
 @function {Promise} can-reflect-promise
-@parent can-infrastructure
+@parent can-typed-data
+@collection can-infrastructure
 @package ./package.json
 @description Expose an observable, Map-like API on Promise types.
 

diff --git a/package.json b/package.json
@@ -2,8 +2,8 @@
   "name": "can-reflect-promise",
   "version": "2.0.0-pre.4",
   "description": "Reflection support for Promise types",
-  "homepage": "http://canjs.com",
-  "author": "Bitovi <contact@bitovi.com> (http://bitovi.com)",
+  "homepage": "https://canjs.com/doc/can-reflect-promise.html",
+  "author": "Bitovi <contact@bitovi.com> (https://www.bitovi.com)",
   "scripts": {
     "preversion": "npm test",
     "postpublish": "git push --tags && git push",