Merge branch 'master' into py3

2014-09-08 21:28:35 +02:00 · 2014-09-08 21:28:35 +02:00 · 26d3f1f8fb
commit 26d3f1f8fb
parent 461fe3b9cf 0c11681de3
10 changed files with 69 additions and 44 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,3 +1,4 @@
+lxml
 simplejson
 ed25519
 SQLAlchemy==0.9.7