diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
commit | 0692c01e4c7b88ce94fe023607109fb978c36c2e (patch) | |
tree | c906a6068f9d3d5e84b1e66bf063e57bbbd70a47 /setup.py | |
parent | 079868489479550d9d8190cde6109cc39cd6272c (diff) | |
parent | 44e51d3464e719e596e1480b7af2957742a9085b (diff) | |
download | mediagoblin-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.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -43,6 +43,7 @@ setup( 'argparse', 'webtest', 'ConfigObj', + 'Markdown', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', |