diff options
| author | Michael Meer <michael@meer.name> | 2014-01-28 09:49:09 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-28 09:49:09 +0100 |
| commit | 8ddee71c2b0f384470965dd46a2e594a4f98f8e0 (patch) | |
| tree | 84bcf6e0f94365b186b4613b43d7a72f5f22f525 /library/ajaxchat/chat/img/license.txt | |
| parent | 904db593df914d2932d9c2f018b00987052461d7 (diff) | |
| parent | f104b4dc275891785ec03abd779d8aafe5163815 (diff) | |
| download | volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.tar.gz volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.tar.bz2 volse-hubzilla-8ddee71c2b0f384470965dd46a2e594a4f98f8e0.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
Diffstat (limited to 'library/ajaxchat/chat/img/license.txt')
| -rw-r--r-- | library/ajaxchat/chat/img/license.txt | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/library/ajaxchat/chat/img/license.txt b/library/ajaxchat/chat/img/license.txt deleted file mode 100644 index 4069d3a13..000000000 --- a/library/ajaxchat/chat/img/license.txt +++ /dev/null @@ -1,45 +0,0 @@ - -The icons used for this project have been created by the - -===================== -Tango Desktop Project -===================== - -http://tango.freedesktop.org/ - - -Additional emoticons have been created by - -============================= -zerwas2ky (KDE-Look.org user) -============================= - -http://www.kde-look.org/content/show.php?content=65591 - - -The icons are licensed under the - -==================================================== -Creative Commons Attribution Share Alike 2.5 License -==================================================== - -http://creativecommons.org/licenses/by-sa/2.5/ - -You are free: - -* to Share — to copy, distribute and transmit the work -* to Remix — to adapt the work - -Under the following conditions: - -* Attribution. -You must attribute the work in the manner specified by the author or licensor -(but not in any way that suggests that they endorse you or your use of the work). - -* Share Alike. -If you alter, transform, or build upon this work, -you may distribute the resulting work only under the same or similar license to this one. - -- For any reuse or distribution, you must make clear to others the license terms of this work. -- Any of the above conditions can be waived if you get permission from the copyright holder. -- Nothing in this license impairs or restricts the author's moral rights. |