Changelog for pytest-dev#265

pelme · Oct 4, 2015 · 98f92ce · 98f92ce
1 parent 411102a
commit 98f92ce
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,7 +8,13 @@ Bug fixes
 ^^^^^^^^^
 * Ensure urlconf is properly reset when using @pytest.mark.urls. Thanks to
   Sarah Bird, David Szotten, Daniel Hahler and Yannick PÉROUX for patch and
-  discussions.
+  discussions. Fixes `issue #183
+  <https://github.com/pytest-dev/pytest-django/issues/183>`_.
+
+* Call `setUpClass()` in Django `TestCase` properly when test class is
+  inherited multiple places. Thanks to Benedikt Forchhammer for report and
+  initial test case. Fixes `issue
+  #265<https://github.com/pytest-dev/pytest-django/issues/265>`_.
 
 Compatibility
 ^^^^^^^^^^^^^