diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 15:48:51 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 15:48:51 +0400 |
| commit | a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da (patch) | |
| tree | e12af401307cfc3120d50c01580cd959f3b2503a /lib/pleroma/constants.ex | |
| parent | decaa64f75f8bd69622fa5fba757f99719f09808 (diff) | |
| parent | e96765df6b04fe5e9766271a9c62e559392758b2 (diff) | |
| download | pleroma-a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da.tar.gz | |
Merge remote-tracking branch 'origin/develop' into global-status-expiration
Diffstat (limited to 'lib/pleroma/constants.ex')
| -rw-r--r-- | lib/pleroma/constants.ex | 3 |
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" ] ) |