Merge pull request #2060 from pytest-dev/master

Merge master into features due to recent CI updates
2016-11-13 18:18:38 -08:00
parent 6876ba9ba6 73d481552d
commit 75740337d1
7 changed files with 59 additions and 17 deletions
--- a/doc/en/talks.rst
+++ b/doc/en/talks.rst
@@ -11,6 +11,9 @@ Talks and Tutorials
 Talks and blog postings
 ---------------------------------------------

+- `Pythonic testing, Igor Starikov (Russian, PyNsk, November 2016)
+  <https://www.youtube.com/watch?v=_92nfdd5nK8>`_.
+
 - `pytest - Rapid Simple Testing, Florian Bruhin, Swiss Python Summit 2016
  <https://www.youtube.com/watch?v=rCBHkQ_LVIs>`_.