diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-02-15 15:43:59 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-15 15:43:59 +0100 |
commit | 95cef3c0e965202a36841a36c189d3917d7706ec (patch) | |
tree | 437fca1226ae5e0881689e20a369493c09f917d8 /.gitattributes | |
parent | dd2c500294c195c9c1c6c774125538968a697583 (diff) | |
download | mitmproxy-95cef3c0e965202a36841a36c189d3917d7706ec.tar.gz mitmproxy-95cef3c0e965202a36841a36c189d3917d7706ec.tar.bz2 mitmproxy-95cef3c0e965202a36841a36c189d3917d7706ec.zip |
merge metadata files
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..53ec8dff --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +mitmproxy/libmproxy/web/static/**/* -diff +mitmproxy/web/src/js/filt/filt.js -diff
\ No newline at end of file |