diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:04:43 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:05:36 -0600 |
| commit | 80891e83d8df25b742a321d2c837e38c805e6582 (patch) | |
| tree | 915321403b8a1639fa317b72d438b8a61a0eb090 /.gitattributes | |
| parent | 4999efad3f0bb0a70a5be5d5c2b970ab564668ca (diff) | |
| parent | 8b8c317c0ff1534d3296369ba315b8919e8dc55c (diff) | |
| download | pleroma-80891e83d8df25b742a321d2c837e38c805e6582.tar.gz pleroma-80891e83d8df25b742a321d2c837e38c805e6582.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 68895bf88..eb0c94757 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,10 @@ *.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. + +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 |