Merge branch 'pypy' of git://github.com/JamieMagee/praw into JamieMag…

…ee-pypy Conflicts: .travis.yml
praw-dev · Apr 9, 2015 · 99582bc · 99582bc
2 parents e1de1f5 + 08a359e
commit 99582bc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,8 @@ python:
   - 3.3
   - 3.4
   - nightly
+  - pypy
+  - pypy3
 matrix:
   allow_failures:
     - python: nightly