Maximilian Hils 353a6ace47 Merge remote-tracking branch 'legend/master' ... Conflicts: libmproxy/web/static/app.js		2015-03-06 10:05:12 +01:00
..
static	Merge remote-tracking branch 'legend/master'	2015-03-06 10:05:12 +01:00
templates	Basic conversion: browserified web app now works.	2014-12-30 21:51:07 +13:00
__init__.py	Unit test framework for web client-side code	2015-01-02 15:29:51 +13:00
app.py	Consolidate reading flows from file, use in mitmweb.	2015-01-02 13:26:22 +13:00