summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-05-03 00:11:50 -0500
committerMichael Merickel <michael@merickel.org>2012-05-03 00:11:50 -0500
commitc1c2b6ad8e22f9cba291de8903edfa4c7c741dca (patch)
treec3bfa436eafa3903af04a4f4f3750a7ddb216830 /setup.cfg
parentc3df7a76fa9f92201fbf57693b580b8904fac038 (diff)
parent004882434aa166a58c3b2148322e08ce61ec4cb7 (diff)
downloadpyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.gz
pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.bz2
pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.zip
Merge branch 'master' into feature.json-api
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index 8aac0afd1..d7622683f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,4 +10,4 @@ cover-erase=1
[aliases]
dev = develop easy_install pyramid[testing]
-
+docs = develop easy_install pyramid[docs]