From: lain <lain@soykaf.club>
Date: Mon, 7 Oct 2019 12:10:27 +0000 (+0000)
Subject: Merge branch 'develop' into 'reactions'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e8395bedd2164723b641e1e28cf08e40875893bf;p=akkoma

Merge branch 'develop' into 'reactions'

# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
---

e8395bedd2164723b641e1e28cf08e40875893bf
diff --cc priv/static/schemas/litepub-0.1.jsonld
index 5e44ad819,1cfcb7ec7..96665844e
--- a/priv/static/schemas/litepub-0.1.jsonld
+++ b/priv/static/schemas/litepub-0.1.jsonld
@@@ -28,12 -27,7 +27,8 @@@
              "oauthRegistrationEndpoint": {
                  "@id": "litepub:oauthRegistrationEndpoint",
                  "@type": "@id"
 -            }
 +            },
-             "uploadMedia": {
-                 "@id": "litepub:uploadMedia",
-                 "@type": "@id"
-             },
 +            "EmojiReaction": "litepub:EmojiReaction"
          }
      ]
  }