From: rinpatch <rinpatch@sdf.org>
Date: Mon, 17 Feb 2020 11:13:37 +0000 (+0000)
Subject: Merge branch 'upgrade_crypto' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=5178c8dbc34db3b78eaa21a2f46300ac1a639c8c;hp=7df13e6f3a654515f143dccf94a2c66675105a35;p=akkoma

Merge branch 'upgrade_crypto' into 'develop'

Update plug_crypto

See merge request pleroma/pleroma!2219
---

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