updated package.json, major version upgrade, added peerDependencies

2016-02-23 15:41:28 +01:00 · 2016-02-23 15:41:28 +01:00 · 43b4d59f9b
commit 43b4d59f9b
parent 64a5fae838
3 changed files with 4 additions and 14 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,10 +0,0 @@
 language: node_js
 before_install:
  - "npm install -g bower"
 node_js:
  - "0.12"
 branches:
  except:
    - dist
  only:
    - master
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 54529ab1e758cbfcb9ac534d9100f63c1ebb5421
+Subproject commit 2f7349b71250e8c84cb052181d2708b981c9234a
--- a/package.json
+++ b/package.json
@ -26,12 +26,12 @@
    "url": "https://github.com/y-js/yjs.git"
  },
  "keywords": [
    "Yjs",
    "OT",
    "Operational Transformation",
    "Collaboration",
    "Synchronization",
-    "ShareJs",
+    "ShareJS",
-    "OpenCoweb",
+    "Coweb",
    "Concurrency"
  ],
  "author": "Kevin Jahns",
		`@ -1 +1 @@`
			`Subproject commit 54529ab1e758cbfcb9ac534d9100f63c1ebb5421`				`Subproject commit 2f7349b71250e8c84cb052181d2708b981c9234a`