aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-03-12 19:41:15 -0700
committerfriendica <info@friendica.com>2013-03-12 19:41:15 -0700
commit62e55ae63b8a32de09987a6e738fd620a9b2f7ea (patch)
tree9b977db9070b97348d62d226e6f436ef9036ef28
parente7b6669dc31d84d7cf2f1f3288b6a758ac88dfda (diff)
downloadvolse-hubzilla-62e55ae63b8a32de09987a6e738fd620a9b2f7ea.tar.gz
volse-hubzilla-62e55ae63b8a32de09987a6e738fd620a9b2f7ea.tar.bz2
volse-hubzilla-62e55ae63b8a32de09987a6e738fd620a9b2f7ea.zip
undo
-rw-r--r--LICENSE19
-rw-r--r--README4
2 files changed, 18 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 35c6d3575..01f1c19d5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,20 @@
-Copyright (c) 2010-2013 Mike Macgirvin
+Copyright (c) 2010-2013 the Friendica Project
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.
diff --git a/README b/README
index 748e7c7e0..a930d0910 100644
--- a/README
+++ b/README
@@ -1,7 +1,3 @@
-Experimental project fork. Nothing is tested. Everything is ad hoc.
-
-If you try to use this code base on a production site you're a fucking moron.
-
Friendica RED Interaction Engine
================================