diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-03 10:08:07 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-03 10:08:07 +0300 |
| commit | 509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21 (patch) | |
| tree | 6939fe33f705c384bdf2bc05a348be02b64ec3fc /lib/pleroma/object | |
| parent | f987d83885eef7cd8d114feefe8870a8c5e841c6 (diff) | |
| parent | 4c02e049358441529c54a72cd11f1c81ee897d49 (diff) | |
| download | pleroma-509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21.tar.gz | |
Merge branch 'develop' into gun
Diffstat (limited to 'lib/pleroma/object')
| -rw-r--r-- | lib/pleroma/object/containment.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/object/fetcher.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/object/containment.ex b/lib/pleroma/object/containment.ex index 9efa50edb..9ae6a5600 100644 --- a/lib/pleroma/object/containment.ex +++ b/lib/pleroma/object/containment.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Object.Containment do diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index d7fd35f1d..263ded5dd 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Object.Fetcher do |