Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer

Conflicts:
	rest_framework/tests/relations_nested.py

1 files changed, 10 insertions, 0 deletions

diff --git a/docs/css/default.css b/docs/css/default.css
index 173d70e0..998efa27 100644
--- a/docs/css/default.css
+++ b/docs/css/default.css
@@ -288,3 +288,13 @@ footer a:hover {
 @media (max-width: 650px) {
   .repo-link.btn-inverse {display: none;}
 }
+
+td, th {
+  padding: 0.25em;
+  background-color: #f7f7f9;
+  border-color: #e1e1e8;
+}
+
+table {
+  border-color: white;
+}