aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-06-19 20:00:35 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-06-19 20:00:35 -0500
commit0692c01e4c7b88ce94fe023607109fb978c36c2e (patch)
treec906a6068f9d3d5e84b1e66bf063e57bbbd70a47 /setup.py
parent079868489479550d9d8190cde6109cc39cd6272c (diff)
parent44e51d3464e719e596e1480b7af2957742a9085b (diff)
downloadmediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.lz
mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.xz
mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.zip
Merge remote branch 'remotes/jwandborg/issue_363'
Conflicts: setup.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index cd0e7f0b..2a007f4e 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ setup(
'argparse',
'webtest',
'ConfigObj',
+ 'Markdown',
## For now we're expecting that users will install this from
## their package managers.
# 'lxml',