Merge branch 'develop' into stable

[akkoma] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index eb0c94757745ff3f67c8374a32a3fd2d98c686fa..febafe62fc45e4bc85c925436dff431e1fdfb6b7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,10 +1,4 @@
 *.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
+*.css diff=css