diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-21 19:47:46 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-21 19:47:46 +0300 |
| commit | 489b12cde48d0ed6b16914c5a831b1e992d0d059 (patch) | |
| tree | 2928b5b9111339f16a5642c4ec07c82851c4f7ed /.gitattributes | |
| parent | ccc2cf0e87f47618163da588ead76846c64cba7a (diff) | |
| parent | ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (diff) | |
| download | pleroma-489b12cde48d0ed6b16914c5a831b1e992d0d059.tar.gz pleroma-489b12cde48d0ed6b16914c5a831b1e992d0d059.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
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 |