Merge branch 'develop' into 'oembed_provider'
authorkaniini <nenolod@gmail.com>
Fri, 25 Jan 2019 05:00:47 +0000 (05:00 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 25 Jan 2019 05:00:47 +0000 (05:00 +0000)
commitc9b418e5477229017b3750c55cf3ea3d03b7e609
treed1b458bea76ff3ec296897de405f9e3c8578f897
parent44693fbf6e5c5ec5622207e263688e3af7d1a83a
parent4df71cd88b2725f1838c2899b3078a74dbb0c33f
Merge branch 'develop' into 'oembed_provider'

# Conflicts:
#   lib/pleroma/activity.ex
lib/pleroma/formatter.ex
lib/pleroma/user.ex
lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex