Chris McDonough
2012-09-16 a98f0cf435e31864e632d9105ffdda30aa776212
Merge branch 'master' of github.com:Pylons/pyramid
2 files modified
8 ■■■■ changed files
.travis.yml 6 ●●●●● patch | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● patch | view | raw | blame | history
.travis.yml
@@ -6,12 +6,6 @@
  - pypy
  - 3.2
# Why does travis-ci's PyPy blow up?  Pyramid's tests
# run fine under tox.
matrix:
  allow_failures:
    - python: pypy
script: python setup.py test
notifications:
CONTRIBUTORS.txt
@@ -182,3 +182,5 @@
- Ian Wilson, 2012/06/17
- Roman Kozlovskyi, 2012/08/11
- Domen Kozar, 2012/09/11