diff options
| author | Michael Merickel <michael@merickel.org> | 2014-08-06 11:59:45 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-08-06 11:59:45 -0500 |
| commit | 9279468d0e4d411652a735e28839bd8a5504ced6 (patch) | |
| tree | 580c1efc1044325a20a242a212d647b81cde6088 /.travis.yml | |
| parent | 407b335ed9954c042377fd2e060c36edcd07cf60 (diff) | |
| parent | 3587a53dc28b8f6411816ccd7fd8fdee0d88acb4 (diff) | |
| download | pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.gz pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.bz2 pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.zip | |
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 29e499e76..ce27b5ec3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - pypy - 3.2 - 3.3 + - 3.4 install: python setup.py dev |