From 43b4d59f9b255b887bc1b026ce90b3b5d3a838db Mon Sep 17 00:00:00 2001
From: Kevin Jahns <kevin.jahns@rwth-aachen.de>
Date: Tue, 23 Feb 2016 15:41:28 +0100
Subject: [PATCH] updated package.json, major version upgrade, added
peerDependencies
---
.travis.yml | 10 ----------
dist | 2 +-
package.json | 6 +++---
3 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100644 .travis.yml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f99e0a90..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: node_js
-before_install:
- - "npm install -g bower"
-node_js:
- - "0.12"
-branches:
- except:
- - dist
- only:
- - master
diff --git a/dist b/dist
index 54529ab1..2f7349b7 160000
--- a/dist
+++ b/dist
@@ -1 +1 @@
-Subproject commit 54529ab1e758cbfcb9ac534d9100f63c1ebb5421
+Subproject commit 2f7349b71250e8c84cb052181d2708b981c9234a
diff --git a/package.json b/package.json
index f0a47efa..7a4d6767 100644
--- 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",
- "OpenCoweb",
+ "ShareJS",
+ "Coweb",
"Concurrency"
],
"author": "Kevin Jahns",
--
GitLab