Merge branch 'develop' into stable

[akkoma] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 355e17f3cbcd8fdccb1968d863bbaa041e1f50d8..febafe62fc45e4bc85c925436dff431e1fdfb6b7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,4 @@
 *.ex diff=elixir
 *.exs diff=elixir
 
-# Most os js/css files included in the repo are minified bundles,
-#   and we don't want to search/diff those as text files. Exceptions are listed below.
-*.js binary
-*.js.map binary
-*.css binary
-priv/static/instance/static.css diff=css
+*.css diff=css