Merge remote-tracking branch 'origin/develop' into global-status-expiration
[akkoma] / .gitattributes
1 *.ex diff=elixir
2 *.exs diff=elixir