projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
mastodon_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/mastodon_view.ex
b/lib/pleroma/web/mastodon_api/views/mastodon_view.ex
index 370fad374619cce36b0adea6bc81ceab35ee5a35..1fd05d9f1ba2f31418325d6d93da2909d6596a16 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/mastodon_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/mastodon_view.ex
@@
-1,5
+1,4
@@
defmodule Pleroma.Web.MastodonAPI.MastodonView do
use Pleroma.Web, :view
import Phoenix.HTML
- import Phoenix.HTML.Form
end