Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / constants.ex

diff --git a/lib/pleroma/constants.ex b/lib/pleroma/constants.ex
index 8f265715c3c2e6f0778aa4941c750ba78c304204..a40741ba606ecf54e001c989b255203793ba7816 100644 (file)
--- a/lib/pleroma/constants.ex
+++ b/lib/pleroma/constants.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Constants do
@@ -18,8 +18,7 @@ defmodule Pleroma.Constants do
       "emoji",
       "context_id",
       "deleted_activity_id",
-      "pleroma_internal",
-      "hashtags"
+      "pleroma_internal"
     ]
   )