python#24918: merge with 3.5.

miss-islington · Mar 13, 2016 · 4c9375b · 4c9375b
2 parents 5f6209a + f2b9a39
commit 4c9375b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Doc/tools/pydoctheme/static/pydoctheme.css b/Doc/tools/pydoctheme/static/pydoctheme.css
@@ -176,3 +176,8 @@ div.footer a:hover {
 .stableabi {
     color: #229;
 }
+
+.highlight {
+    background: none !important;
+}
+
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -766,6 +766,7 @@ Pat Knight
 Jeff Knupp
 Kubilay Kocak
 Greg Kochanski
+Manvisha Kodali
 Damon Kohler
 Marko Kohtala
 Vajrasky Kok