diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-12-30 17:10:02 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-12-30 17:10:02 -0600 |
| commit | cbce88007672dc810cb345bb9872a009cbdc93d8 (patch) | |
| tree | 45be2517812f2a598d9b6133554038a87d4b9f46 /.gitattributes | |
| parent | 83770b7b391fdf8bdc22f63047b1cf444a7b16ce (diff) | |
| parent | 38924166eb3228deb71a2e23f1e8fd3255c6bd85 (diff) | |
| download | pleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.tar.gz pleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index c46415a5c..eb0c94757 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,10 @@ *.ex diff=elixir *.exs diff=elixir + +priv/static/instance/static.css diff=css + +# Most of 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 |