Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into rm-unsupported
  • Loading branch information
hugovk authored Nov 1, 2017
commit a48cf233019a1c57066183fc46138601f7824ec0
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {py27,py35}-{c,pure},{pypy,pypy3}-pure,py27-x86
envlist = {py27,py35,py36}-{c,pure},{pypy,pypy3}-pure,py27-x86,py34-x86

[variants:pure]
setenv=
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.