projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve merge conflict
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
list_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/list_view.ex
b/lib/pleroma/web/mastodon_api/views/list_view.ex
index dd0121f7a49d489500d87101066040b1a56b755a..0f86e2512932d3ca98acd48db4bd0ec6d92f4d82 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/list_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/list_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ListView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ListView do