diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
| commit | e4dc3f71aea900e566c0d66ddffc5cd57e3920dd (patch) | |
| tree | d0b0edfd3c7aa4c2015b0b461a4c40895e16eba9 /lib/pleroma/activity.ex | |
| parent | 9a6236e69d2709c0df374574fd77c4b2bc3d68fb (diff) | |
| parent | 19b6a8239387869c69c6885044ee488d097b723f (diff) | |
| download | pleroma-e4dc3f71aea900e566c0d66ddffc5cd57e3920dd.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'lib/pleroma/activity.ex')
| -rw-r--r-- | lib/pleroma/activity.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index 200addd6e..353f9f6cd 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -1,8 +1,14 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + defmodule Pleroma.Activity do use Ecto.Schema alias Pleroma.{Repo, Activity, Notification} import Ecto.Query + @type t :: %__MODULE__{} + # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19 @mastodon_notification_types %{ "Create" => "mention", |