dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "maintenance: Enable gzip in router.php for static files"
[lhc/web/wiklou.git]
/
COPYING
diff --git
a/COPYING
b/COPYING
index
c3bed28
..
8cecc2e
100644
(file)
--- a/
COPYING
+++ b/
COPYING
@@
-6,7
+6,7
@@
MediaWiki is licensed under the terms of the GNU General Public License,
version 2 or later. Derivative works and later versions of the code must be
free software licensed under the same or a compatible license. This includes
"extensions" that use MediaWiki functions or variables; see
version 2 or later. Derivative works and later versions of the code must be
free software licensed under the same or a compatible license. This includes
"extensions" that use MediaWiki functions or variables; see
-http://www.gnu.org/licenses/gpl-faq.html#GPLAndPlugins for details.
+http
s
://www.gnu.org/licenses/gpl-faq.html#GPLAndPlugins for details.
For the full text of version 2 of the license, see
https://www.gnu.org/licenses/gpl-2.0.html or '''GNU General Public License'''
For the full text of version 2 of the license, see
https://www.gnu.org/licenses/gpl-2.0.html or '''GNU General Public License'''
@@
-30,11
+30,13
@@
under the GPL for use of the whole code or other sections thereof.
MediaWiki uses the following Creative Commons icons to illustrate links to the
CC licenses:
MediaWiki uses the following Creative Commons icons to illustrate links to the
CC licenses:
-* skins/common/images/cc-by-nc-sa.png
-* skins/common/images/cc-by-sa.png
+* resources/assets/licenses/cc-0.png
+* resources/assets/licenses/cc-by-nc-sa.png
+* resources/assets/licenses/cc-by-sa.png
+* resources/assets/licenses/cc-by.png
These icons are trademarked, and used subject to the CC trademark license,
These icons are trademarked, and used subject to the CC trademark license,
-available at http://creativecommons.org/policies#trademark
+available at http
s
://creativecommons.org/policies#trademark
== GNU GENERAL PUBLIC LICENSE ==
== GNU GENERAL PUBLIC LICENSE ==