aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-21 17:14:58 -0700
committerzotlabs <mike@macgirvin.com>2017-03-21 17:14:58 -0700
commitc1cc7bfc945e4da4150c9ed99dc11981767b4ccb (patch)
tree2be84b187ae55ce5a4a11e5b0282131e7937a683 /LICENSE
parent82631c3413b7fc7025f46cd23c17d3ea292cf16c (diff)
downloadvolse-hubzilla-c1cc7bfc945e4da4150c9ed99dc11981767b4ccb.tar.gz
volse-hubzilla-c1cc7bfc945e4da4150c9ed99dc11981767b4ccb.tar.bz2
volse-hubzilla-c1cc7bfc945e4da4150c9ed99dc11981767b4ccb.zip
update license
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE19
1 files changed, 2 insertions, 17 deletions
diff --git a/LICENSE b/LICENSE
index bb0e40327..580742e56 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,5 @@
Copyright (c) 2010-2017 Mike Macgirvin
All rights reserved.
-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.
+Portions of this work created prior to March 2017 MAY be
+available under the terms of the Hubzilla project license.