diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-11-21 10:23:53 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-11-21 10:23:53 -0600 |
| commit | 30ed7b502f5db14a4635d3d80a62df3c18b91813 (patch) | |
| tree | 84a76b9881e8545a6afc472c9c97b044735e248c /.gitattributes | |
| parent | 9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af (diff) | |
| parent | ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (diff) | |
| download | pleroma-30ed7b502f5db14a4635d3d80a62df3c18b91813.tar.gz pleroma-30ed7b502f5db14a4635d3d80a62df3c18b91813.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
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 |