aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING-README
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <jan@unhosted.org>2011-10-07 16:05:29 +0200
committerJan-Christoph Borchardt <jan@unhosted.org>2011-10-07 16:05:39 +0200
commit0aaa1fb64ef536fab842a9e96db7f29d2ed17419 (patch)
treea8782ca90b918439312f3af94d8dc472e4aa15a7 /COPYING-README
parent980a0893f0070de007d5c3842994c6720b381117 (diff)
downloadnextcloud-server-0aaa1fb64ef536fab842a9e96db7f29d2ed17419.tar.gz
nextcloud-server-0aaa1fb64ef536fab842a9e96db7f29d2ed17419.zip
added Silk icons by Mark James (CC-BY)
Diffstat (limited to 'COPYING-README')
-rw-r--r--COPYING-README15
1 files changed, 8 insertions, 7 deletions
diff --git a/COPYING-README b/COPYING-README
index b0caca2ad21..49e035186ed 100644
--- a/COPYING-README
+++ b/COPYING-README
@@ -2,13 +2,14 @@ Files in ownCloud are licensed under the Affero General Public License version 3
the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
unless otherwise noted.
-Components of ownCloud:
-* jQuery is dual licensed under MIT and GPL
-* HTTP is three clause BSD license
-* MDB2 uses a custom license in the BSD style
-* User is AGPL
-* XML/RPC is both MIT and PHP license
+Licensing of components:
+* jQuery: MIT / GPL
+* HTTP: 3 clause BSD
+* MDB2: BSD style custom
+* User: AGPL
+* XML/RPC: MIT / PHP
+* Silk icons: Creative Commons Attribution
All unmodified files from these and other sources retain their original copyright
and license notices: see the relevant individual files.
-Attribution information for ownCloud is contained in the AUTHORS file.
+Attribution information for ownCloud is contained in the AUTHORS file. \ No newline at end of file