Merge branch 'master' of https://github.com/roglew/pappy-proxy into crypt

2016-04-11 17:06:03 -04:00 · 2016-04-11 17:06:03 -04:00 · 61dc550f9e
commit 61dc550f9e
parent 772e7ee507 d2f0e5c222
17 changed files with 625 additions and 1061 deletions
--- a/setup.py
+++ b/setup.py
@ -26,6 +26,7 @@ setup(name='pappyproxy',
          'cmd2>=0.6.8',
          'crochet>=1.4.0',
          'Jinja2>=2.8',
+          'lxml>=3.6.0',
          'pygments>=2.0.2',
          'pyperclip>=1.5.26',
          'pytest-cov>=2.2.0',