Merge remote-tracking branch 'origin/master' into urllib3

leandrotoledo · leandrotoledo · commit 05522e43219a · 2016-06-19T17:38:19.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
     -   id: yapf
         files: ^(telegram|tests)/.*\.py$
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: adbb569fe9a64ad9bce3b53a77f1bc39ef31f682
+    sha: 6dfcb89af3c9b4d172cc2e5a8a2fa0f54615a338
     hooks:
     -   id: flake8
         files: ^telegram/.*\.py$
