Merge branch 'master' of github.com:SurveyMonkey/CheesePrism

k0s · Jan 25, 2012 · c85aa51 · c85aa51
2 parents 456451f + 8825e30
commit c85aa51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@
 *_flymake.py
 *#*
 tests/test-indexes/*
-/doc/example-index/*
+/doc/example-index/*
+env*/
diff --git a/setup.py b/setup.py
@@ -13,6 +13,7 @@
             'pyramid_debugtoolbar',
             'pyramid_jinja2',
             'requests',
+            'Paste',
             'pip']
 
 setup(name='CheesePrism',