Commit 411973ac authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5' into erp5-component

parents 43638852 9efa1ae1
...@@ -438,6 +438,7 @@ eggs = ...@@ -438,6 +438,7 @@ eggs =
ordereddict ordereddict
paramiko paramiko
ply ply
pyflakes
pyPdf # should be replaced by PyPDF2, but it is not installable pyPdf # should be replaced by PyPDF2, but it is not installable
python-magic python-magic
python-memcached python-memcached
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment