diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-15 19:23:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-15 19:23:16 -0400 |
| commit | a98f0cf435e31864e632d9105ffdda30aa776212 (patch) | |
| tree | f75042c8b99e414eac88ade8f701871acf655e8d | |
| parent | 07cb8f0e112642a6a40127232ddc06125a73750e (diff) | |
| parent | 8402b63ff8edf2ae6268108afbdb3180a64c730b (diff) | |
| download | pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.tar.gz pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.tar.bz2 pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 490fd2df7..ab9c3ff30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,6 @@ python: - 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: diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 264acf048..bb11006f3 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -182,3 +182,5 @@ Contributors - Ian Wilson, 2012/06/17 - Roman Kozlovskyi, 2012/08/11 + +- Domen Kozar, 2012/09/11 |