Merge branch 'master' into patch-5

This commit is contained in:
2016-01-09 18:51:51 +08:00
4 changed files with 13 additions and 3 deletions
+1
View File
@@ -32,6 +32,7 @@ docs/_build*
.test_config
.tox
.cache
!tests/__init__.py
!tests/config.py