diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-23 13:58:35 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-02-23 13:58:35 +0300 |
| commit | 8f88a90ca3f2f2c7c341126f6816db9667664ea7 (patch) | |
| tree | 9bc009ad6e604941c3345d7e27acd58da19c57ad /lib/pleroma/web/api_spec.ex | |
| parent | 77f3da035894e2add911101466bfe41b99ee481e (diff) | |
| parent | 484ba5d062d93fd0cf4841e7743724928af5a2d9 (diff) | |
| download | pleroma-8f88a90ca3f2f2c7c341126f6816db9667664ea7.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
Diffstat (limited to 'lib/pleroma/web/api_spec.ex')
| -rw-r--r-- | lib/pleroma/web/api_spec.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/api_spec.ex b/lib/pleroma/web/api_spec.ex index b16068f7b..adc8762dc 100644 --- a/lib/pleroma/web/api_spec.ex +++ b/lib/pleroma/web/api_spec.ex @@ -85,7 +85,7 @@ defmodule Pleroma.Web.ApiSpec do "name" => "Administration", "tags" => [ "Chat administration", - "Emoji packs", + "Emoji pack administration", "Frontend managment", "Instance configuration", "Instance documents", @@ -127,7 +127,7 @@ defmodule Pleroma.Web.ApiSpec do "Status actions" ] }, - %{"name" => "Miscellaneous", "tags" => ["Reports", "Suggestions"]} + %{"name" => "Miscellaneous", "tags" => ["Emoji packs", "Reports", "Suggestions"]} ] } } |