diff options
| author | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
| commit | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (patch) | |
| tree | 0015c7c3ea57f7340fbf80fd230a5f5e1c548148 /.gitattributes | |
| parent | c2186a62d54043ea9638d33f80c7576aba9783e8 (diff) | |
| parent | 0a589c887bd4215e7d443a34c194fd0a3bde8f72 (diff) | |
| download | pleroma-b221d77a6da07c684bdbc63ddf4500e0d7ffeae8.tar.gz pleroma-b221d77a6da07c684bdbc63ddf4500e0d7ffeae8.zip | |
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
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 |