diff options
| author | Thomas Waldmann <tw@waldmann-edv.de> | 2017-01-15 01:15:04 +0100 |
|---|---|---|
| committer | Thomas Waldmann <tw@waldmann-edv.de> | 2017-01-15 01:15:04 +0100 |
| commit | 740312f725c16fde3bdf34c4a6def3ade28076bf (patch) | |
| tree | ca6af8ac56189e07a81f0f927b2a928c8c91f863 /requirements.d | |
| parent | 29a9e995e69cebbcb6d37db1c796803baf777c12 (diff) | |
| parent | e022cf117c649761fb2169f0b9d021f78e7f7fd8 (diff) | |
Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
# requirements.d/development.txt
# tox.ini
Diffstat (limited to 'requirements.d')
| -rw-r--r-- | requirements.d/development.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/requirements.d/development.txt b/requirements.d/development.txt index e3417060d..de2428108 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,3 +1,5 @@ +setuptools +pip virtualenv tox pytest |