Merge branch 'develop' into stable

[akkoma] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 68895bf883004acdbc4f8faa03ae727cd1cb45ae..febafe62fc45e4bc85c925436dff431e1fdfb6b7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,4 @@
 *.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.
-*.js binary
-*.js.map binary
-*.css binary
+
+*.css diff=css