Merge "Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter table...

diff --git a/.gitignore b/.gitignore
index 6688707..943378a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ cache/*.cdb
 images/[0-9a-f]
 images/temp
 images/thumb
+maintenance/dev/data/
+maintenance/.mweval_history
\ No newline at end of file

diff --git a/CREDITS b/CREDITS
index 54402b0..d0c4623 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -199,4 +199,4 @@ following names for their contribution to the product.
 * Meno25
 * Rotem Liss
 * Shinjiman
-* Translatewiki.net Translators http://translatewiki.net/wiki/Special:ListUsers/translator
+* Translatewiki.net Translators https://translatewiki.net/wiki/Special:ListUsers/translator