diff options
| author | Chris McDonough <chrism@plope.com> | 2014-04-08 09:08:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-04-08 09:08:02 -0400 |
| commit | ecb376a132034bd4ccfe1daa69d4828699e9028d (patch) | |
| tree | 912b74c4dc61370bb46487f5c52fc705c70e150e /setup.py | |
| parent | e012af904feb15f20a134f22eaeeb61bd9d56cc8 (diff) | |
| parent | bcf18220be9c21ff4b1af50f45b90aadfa7820f5 (diff) | |
| download | pyramid-ecb376a132034bd4ccfe1daa69d4828699e9028d.tar.gz pyramid-ecb376a132034bd4ccfe1daa69d4828699e9028d.tar.bz2 pyramid-ecb376a132034bd4ccfe1daa69d4828699e9028d.zip | |
fix merge conflict while merging master to 1.5 branch
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -79,6 +79,7 @@ setup(name='pyramid', "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Pyramid", |