diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
| commit | 98b96e45ababecb7554232787968f2f326f24e54 (patch) | |
| tree | 66e907ccc1acd2c667b57f5b5d0a8db34cbd288c /priv | |
| parent | 2f2bd7fe72f474b7177c751a2dc3af716622ba91 (diff) | |
| parent | ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc (diff) | |
| download | pleroma-98b96e45ababecb7554232787968f2f326f24e54.tar.gz pleroma-98b96e45ababecb7554232787968f2f326f24e54.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/repo/migrations/20190408123347_create_conversations.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/repo/migrations/20190408123347_create_conversations.exs b/priv/repo/migrations/20190408123347_create_conversations.exs index d75459e82..3eaa6136c 100644 --- a/priv/repo/migrations/20190408123347_create_conversations.exs +++ b/priv/repo/migrations/20190408123347_create_conversations.exs @@ -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.Repo.Migrations.CreateConversations do |