diff options
| author | lain <lain@soykaf.club> | 2020-12-09 15:55:45 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-12-09 15:55:45 +0000 |
| commit | 477c6c8e558c1b1f193caadb6172db840c1910a4 (patch) | |
| tree | 6d7f533436d9de01b4190db1318da98ea719cd49 /.gitattributes | |
| parent | 1436a2fa2dfd5fef6d61d1bba9ba074b359b40a3 (diff) | |
| parent | 055a306380cdfc7b34faeaa90c09e408569f3b92 (diff) | |
| download | pleroma-477c6c8e558c1b1f193caadb6172db840c1910a4.tar.gz pleroma-477c6c8e558c1b1f193caadb6172db840c1910a4.zip | |
Merge branch 'auth-improvements' into 'develop'
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
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 |