diff options
author | Bruno Oliveira <nicoddemus@gmail.com> | 2016-09-01 23:07:49 -0300 |
---|---|---|
committer | Bruno Oliveira <nicoddemus@gmail.com> | 2016-09-01 23:07:49 -0300 |
commit | f5d900d972c16d1d515d43e00501046c9b2905f7 (patch) | |
tree | 8d8bc5085ead747940c2661e5b8fe4e755ba083a /_pytest/__init__.py | |
parent | 9d2149d9c0c0ce515de33517616d03bb258a1b62 (diff) | |
parent | 96a1d2941b5fc72832c54fca7e3f7eedcda991cd (diff) | |
download | pytest-f5d900d972c16d1d515d43e00501046c9b2905f7.tar.gz |
Merge remote-tracking branch 'upstream/master' into features
Diffstat (limited to '_pytest/__init__.py')
-rw-r--r-- | _pytest/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 989d8a975..0a37f23b2 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '3.1.0.dev' +__version__ = '3.1.0.dev0' |