diff options
author | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
---|---|---|
committer | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
commit | 273594af62c960b5a52da5ec1cf6d6bd450415ba (patch) | |
tree | 5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /addon/js_upload/file-uploader/license.txt | |
parent | 1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff) | |
parent | dfd5cc57c2134067dc6229b8583b5e808f160004 (diff) | |
download | volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2 volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'addon/js_upload/file-uploader/license.txt')
-rw-r--r-- | addon/js_upload/file-uploader/license.txt | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/addon/js_upload/file-uploader/license.txt b/addon/js_upload/file-uploader/license.txt deleted file mode 100644 index 25cdd3d27..000000000 --- a/addon/js_upload/file-uploader/license.txt +++ /dev/null @@ -1,24 +0,0 @@ -File uploader component is licensed under GNU GPL 2 or later, see gpl-2.0.txt. -© 2010 Andrew Valums - -This distribution also includes: - - server/OctetStreamReader.java - Dual Licensed under the MIT and GPL v.2 - - jQuery JavaScript Library - http://jquery.com/ - Copyright 2010, John Resig - Dual licensed under the MIT or GPL Version 2 licenses. - http://jquery.org/license - - Sizzle.js - CSS selector engine used by jQuery - http://sizzlejs.com/ - Copyright 2010, The Dojo Foundation - Released under the MIT, BSD, and GPL Licenses. - - QUnit - A JavaScript Unit Testing Framework - http://docs.jquery.com/QUnit - Copyright (c) 2009 John Resig, Jörn Zaefferer - Dual licensed under the MIT (MIT-LICENSE.txt) - and GPL (GPL-LICENSE.txt) licenses.
\ No newline at end of file |