diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2016-03-18 18:26:56 -0300 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2016-03-18 18:26:56 -0300 |
| commit | 5fcce8a7d6ab58af670748ef483329f377679eed (patch) | |
| tree | 1c22eda67736d41e74957f671966ae9fbc00393d /_pytest/__init__.py | |
| parent | ceacc12b5293672c8800ea10a5c553e22dd7898f (diff) | |
| parent | a70e92777f9e1a5c20e75903ba165c240f1e54ff (diff) | |
| download | pytest-5fcce8a7d6ab58af670748ef483329f377679eed.tar.gz | |
Merge branch 'master' into merge-master-into-features
Diffstat (limited to '_pytest/__init__.py')
| -rw-r--r-- | _pytest/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 79942e374..fcbd2cde7 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,3 @@ # + __version__ = '2.10.0.dev1' |