aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-02-17 10:35:41 +1300
committerAldo Cortesi <aldo@corte.si>2016-02-17 10:35:41 +1300
commit887ecf88967fe6caf8f8d5443e49b6bfcfbfcd0d (patch)
tree4c3b4f9cc555a945ddbeeb1b179070ef98b2eeff /.gitattributes
parentef8e95956d938fd4891d79fdbfa83f8a77a482cb (diff)
parentb87797ea255a0e2058e0574a5a00150f7f2df5db (diff)
downloadmitmproxy-887ecf88967fe6caf8f8d5443e49b6bfcfbfcd0d.tar.gz
mitmproxy-887ecf88967fe6caf8f8d5443e49b6bfcfbfcd0d.tar.bz2
mitmproxy-887ecf88967fe6caf8f8d5443e49b6bfcfbfcd0d.zip
Merge pull request #950 from Kriechi/rename
Rename lib folders
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index 53ec8dff..c0efd4e4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-mitmproxy/libmproxy/web/static/**/* -diff
-mitmproxy/web/src/js/filt/filt.js -diff \ No newline at end of file
+mitmproxy/mitmproxy/web/static/**/* -diff
+mitmproxy/web/src/js/filt/filt.js -diff