summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-17 15:01:38 +0100
committerlain <lain@soykaf.club>2020-11-17 15:01:38 +0100
commitfec1ed802ef44a700df27aa132146f79e9e4cd6d (patch)
tree6bbb39b647305521209bebbd7bdea3e4be012d1c /.gitattributes
parent81293e5aadd5f1dfe7f90f6a71f625ef86cf3359 (diff)
parent9b9afe6b3fde77ef005629fe2d198160c8f465a1 (diff)
downloadpleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.tar.gz
pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index c46415a5c..68895bf88 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,8 @@
*.ex diff=elixir
*.exs diff=elixir
+# At the time of writing all js/css files included
+# in the repo are minified bundles, and we don't want
+# to search/diff those as text files.
+*.js binary
+*.js.map binary
+*.css binary