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

2017-12-11 17:28:43 -06:00 · 2017-12-11 17:28:43 -06:00 · 1fd7260653
commit 1fd7260653
parent 33fa4ce03b 864b1400b4
16 changed files with 1 additions and 0 deletions
--- a/pappyproxy/pycache/colors.cpython-35.pyc
+++ b/pappyproxy/pycache/colors.cpython-35.pyc
--- a/pappyproxy/pycache/config.cpython-35.pyc
+++ b/pappyproxy/pycache/config.cpython-35.pyc
--- a/pappyproxy/pycache/console.cpython-35.pyc
+++ b/pappyproxy/pycache/console.cpython-35.pyc
--- a/pappyproxy/pycache/macros.cpython-35.pyc
+++ b/pappyproxy/pycache/macros.cpython-35.pyc
--- a/pappyproxy/pycache/pap.cpython-35.pyc
+++ b/pappyproxy/pycache/pap.cpython-35.pyc
--- a/pappyproxy/pycache/proxy.cpython-35.pyc
+++ b/pappyproxy/pycache/proxy.cpython-35.pyc
--- a/pappyproxy/pycache/util.cpython-35.pyc
+++ b/pappyproxy/pycache/util.cpython-35.pyc
--- a/pappyproxy/interface/pycache/context.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/context.cpython-35.pyc
--- a/pappyproxy/interface/pycache/decode.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/decode.cpython-35.pyc
--- a/pappyproxy/interface/pycache/macros.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/macros.cpython-35.pyc
--- a/pappyproxy/interface/pycache/mangle.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/mangle.cpython-35.pyc
--- a/pappyproxy/interface/pycache/misc.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/misc.cpython-35.pyc
--- a/pappyproxy/interface/pycache/tags.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/tags.cpython-35.pyc
--- a/pappyproxy/interface/pycache/test.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/test.cpython-35.pyc
--- a/pappyproxy/interface/pycache/view.cpython-35.pyc
+++ b/pappyproxy/interface/pycache/view.cpython-35.pyc
--- a/setup.py
+++ b/setup.py
@ -14,6 +14,7 @@ setup(name='pappyproxy',
      #url='https://www.github.com/roglew/puppy-proxy',
      packages=['pappyproxy', 'pappyproxy.interface'],
      include_package_data = True,
+      package_data={'pappyproxy': ['templates', 'lists']},
      license='MIT',
      entry_points = {
          'console_scripts':['pappy = pappyproxy.pap:start'],