diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-11-17 18:34:04 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-11-17 18:34:04 +0400 |
| commit | f69fe36ebfdb6fad4af853f002705f5ea3c697a1 (patch) | |
| tree | 29f21b7c20369f23f444438e2b0c3fe2bf398a58 /.gitattributes | |
| parent | 81145ecdf52c74147c842ab6c099abf5e1ad1eff (diff) | |
| parent | 61f86774d183b8ba130551999ea498e5f5c71681 (diff) | |
| download | pleroma-f69fe36ebfdb6fad4af853f002705f5ea3c697a1.tar.gz pleroma-f69fe36ebfdb6fad4af853f002705f5ea3c697a1.zip | |
Merge branch 'develop' into frontend-admin-api
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 |