Merge "Memory setting for djvutext is now a constant"

[lhc/web/wiklou.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 5ceccc5..6555b07 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,7 +1,8 @@
-MediaWiki 1.20 is a collaborative project released under the
+MediaWiki 1.21 is a collaborative project released under the

 GNU General Public License v2. We would like to recognize the
 following names for their contribution to the product.
 
 GNU General Public License v2. We would like to recognize the
 following names for their contribution to the product.
 

+<!-- Please notice that the following can be found parsed under Special:Version/Credits -->

 == Developers ==
 * Aaron Schulz
 * Alex Z.
 == Developers ==
 * Aaron Schulz
 * Alex Z.


@@ -44,6 +45,7 @@ following names for their contribution to the product.
 * Leon Weber
 * Leslie Hoare
 * Marco Schuster
 * Leon Weber
 * Leslie Hoare
 * Marco Schuster

+* Marius Hoch

 * Matěj Grabovský
 * Matt Johnston
 * Max Semenik
 * Matěj Grabovský
 * Matt Johnston
 * Max Semenik


@@ -206,4 +208,4 @@ following names for their contribution to the product.
 * Meno25
 * Rotem Liss
 * Shinjiman
 * Meno25
 * Rotem Liss
 * Shinjiman

-* Translatewiki.net Translators https://translatewiki.net/wiki/Special:ListUsers/translator
+* [https://translatewiki.net/wiki/Special:ListUsers/translator Translatewiki.net Translators]