projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1559-follow-request-notifications' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
conversation_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/conversation_view.ex
b/lib/pleroma/web/mastodon_api/views/conversation_view.ex
index 2220fbcb18e327673926e41ecfd0b4309f674223..2b6f84c72bbea703236178cb8c78f2f93eb13c05 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/conversation_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/conversation_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationView do