Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma] / .gitattributes
1 *.ex diff=elixir
2 *.exs diff=elixir