Merge branch 'develop' into 'reactions'

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

diff --cc priv/static/schemas/litepub-0.1.jsonld
index 5e44ad819ff1112e74570fdeab327bb6f612b1ff,1cfcb7ec7025e678885ea5b9c53b98156974dc02..96665844ecb2c26d5d6a346481444bc39442af11
--- 1/priv/static/schemas/litepub-0.1.jsonld
--- 2/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"
          }
      ]
  }