Skip to content

Commit

Permalink
Update CHANGELOG for #54
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Jun 10, 2016
1 parent 861f9e8 commit 55d436a
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
1.2.dev
-------

* Try to import ``mock`` first instead of ``unittest.mock``. This gives the user flexibility
to install a newer ``mock`` version from PyPI instead of using the one available in the
Python distribution.
Thanks `@wcooley`_ for the PR (`#54`_).

.. _@wcooley: https://github.com/wcooley
.. _#54: https://github.com/pytest-dev/pytest-mock/issues/54

1.1
---

Expand Down

0 comments on commit 55d436a

Please sign in to comment.