aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeremy Cohen2014-07-22 10:43:04 -0700
committerGeremy Cohen2014-07-22 10:43:04 -0700
commit7e8391135f0a3f4c4864c2a39b0d5002a327ae5c (patch)
tree1bac783c89d5078ac0809b01a871af6f555765ae
parent6f4b73d7f0d57175755881e6609d8dc0912db6f6 (diff)
downloadpubnub-python-feature-pt74838232.tar.bz2
Update LICENSEfeature-pt74838232
-rw-r--r--python-twisted/LICENSE23
1 files changed, 6 insertions, 17 deletions
diff --git a/python-twisted/LICENSE b/python-twisted/LICENSE
index 3efa392..54804bc 100644
--- a/python-twisted/LICENSE
+++ b/python-twisted/LICENSE
@@ -3,23 +3,12 @@ Copyright (c) 2013 PubNub Inc.
http://www.pubnub.com/
http://www.pubnub.com/terms
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+PubNub hereby grants you, solely during the term of this private beta,
+a non-exclusive, non-transferable, revocable license, without rights
+to sublicense, to incorporate libraries and APIs that are included herein
+into your applications, to reproduce and distribute such libraries and APIs
+together with your applications and to access and use the PubNub Service
+via the Internet, solely for use with your applications.
PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks
Copyright (c) 2013 PubNub Inc.