diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-18 17:46:09 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-18 17:46:09 +0300 |
| commit | 61d9f43e463a3b3b0c1e4b9c98c22e222797bd82 (patch) | |
| tree | d0db351126377c4a648155df4dfdfd4358874b9c /.gitattributes | |
| parent | 269d592181bff8601f6545b85158ee1c222ff20d (diff) | |
| parent | 3fa2ac68df10f6ffe3c1ea76fa10c30da90f4bd0 (diff) | |
| download | pleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.tar.gz pleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..c46415a5c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.ex diff=elixir +*.exs diff=elixir |