diff options
| author | lain <lain@soykaf.club> | 2020-09-23 10:49:29 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 10:49:29 +0000 |
| commit | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (patch) | |
| tree | 559fe96b7f65cd750a4bab5e9a117c43829c800f /lib/pleroma/web/router.ex | |
| parent | 34235bc02a88718b1d5a9d7fa2437784b91bb692 (diff) | |
| parent | a6c14041c49df0dc850204723cfc1f242ded8aa2 (diff) | |
| download | pleroma-a5e1c400e49e7979e70f2c9dd4887ae144dca44c.tar.gz | |
Merge branch 'issue/1975' into 'develop'
[#1975] import emoji from a zip archive
Closes admin-fe#130
See merge request pleroma/pleroma!2911
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index f924e1e91..42a9db21d 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -238,9 +238,9 @@ defmodule Pleroma.Web.Router do patch("/:name", EmojiPackController, :update) delete("/:name", EmojiPackController, :delete) - post("/:name/files", EmojiPackController, :add_file) - patch("/:name/files", EmojiPackController, :update_file) - delete("/:name/files", EmojiPackController, :delete_file) + post("/:name/files", EmojiFileController, :create) + patch("/:name/files", EmojiFileController, :update) + delete("/:name/files", EmojiFileController, :delete) end # Pack info / downloading |