summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-04 18:29:13 +0000
committerkaniini <nenolod@gmail.com>2019-03-04 18:29:13 +0000
commitd45dbdce5a478a004711baad963d7134988402ed (patch)
tree6dfcc121950f9513ae82bfc147c6dbc1b3b069a6 /mix.exs
parentca5d894e6811e0020facabdaa12d2fd263b497c5 (diff)
parent0245ce842fad4dd53f3c6f6e4a146fc857e8eb1d (diff)
downloadpleroma-d45dbdce5a478a004711baad963d7134988402ed.tar.gz
pleroma-d45dbdce5a478a004711baad963d7134988402ed.zip
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 0fe9c6ec3..70b5e4bd6 100644
--- a/mix.exs
+++ b/mix.exs
@@ -76,7 +76,7 @@ defmodule Pleroma.Mixfile do
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
- {:ex_machina, "~> 2.2", only: :test},
+ {:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.1", only: :test},
{:crypt,