aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/constants.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-15 13:33:04 +0200
committerlain <lain@soykaf.club>2020-05-15 13:33:04 +0200
commitf012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (patch)
treea3847182efa357bce56c12d6253492dc0cc2b894 /lib/pleroma/constants.ex
parent1d18721a3c60aa0acc7d1ba858a92277e544a54a (diff)
parent081d1d3f48f2264ee329f7ff7af7c2f88fe0a654 (diff)
downloadpleroma-f012c3a202ef43d1a8a1dc88f08057b7a41d3d78.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/constants.ex')
-rw-r--r--lib/pleroma/constants.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/constants.ex b/lib/pleroma/constants.ex
index 3a9eec5ea..06174f624 100644
--- a/lib/pleroma/constants.ex
+++ b/lib/pleroma/constants.ex
@@ -17,7 +17,8 @@ defmodule Pleroma.Constants do
"announcement_count",
"emoji",
"context_id",
- "deleted_activity_id"
+ "deleted_activity_id",
+ "pleroma_internal"
]
)