Commit ac436cfb authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5-component

parents 646c9b5a f6946c0a
...@@ -666,6 +666,7 @@ hexagonit.recipe.cmmi = 2.0 ...@@ -666,6 +666,7 @@ hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3 http-parser = 0.8.3
httplib2 = 0.9 httplib2 = 0.9
iniparse = 0.4 iniparse = 0.4
interval = 1.0.0
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
interval = 1.0.0 interval = 1.0.0
ipdb = 0.8 ipdb = 0.8
......
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