aboutsummaryrefslogtreecommitdiffstats
path: root/library/ajaxchat/chat/license.txt
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-01-30 00:08:40 +0100
committermarijus <mario@localhost.localdomain>2014-01-30 00:08:40 +0100
commita58239b9a8d8c35fa0e0b916617fa53d1014da58 (patch)
tree4ebaf732d319efb80d9edebd941fb0be9e35cc06 /library/ajaxchat/chat/license.txt
parentb39475db86eca7b5e5615d377d8adc64e6a33056 (diff)
parentfe2b6f3dfb4a9473905dde49b7741a6c03699c23 (diff)
downloadvolse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.gz
volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.tar.bz2
volse-hubzilla-a58239b9a8d8c35fa0e0b916617fa53d1014da58.zip
Merge branch 'upstream'
Diffstat (limited to 'library/ajaxchat/chat/license.txt')
-rw-r--r--library/ajaxchat/chat/license.txt28
1 files changed, 0 insertions, 28 deletions
diff --git a/library/ajaxchat/chat/license.txt b/library/ajaxchat/chat/license.txt
deleted file mode 100644
index 618f9a318..000000000
--- a/library/ajaxchat/chat/license.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Modified MIT License (MIT)
-
-Copyright (c) 2013 blueimp.net
-
-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.
-
-The above license does not apply to files included in the AJAX Chat project
-which fall under other licenses. Such files are provided with their own
-license text included beside or within the files themselves.
-The presence of this modified MIT license in AJAX Chat does NOT supersede
-the licenses applying to those files. You many NOT redistribute this project
-or included files in a way that conflicts with their respective licenses. \ No newline at end of file