Merge branch 'develop' into 'feature/staff-discovery-api'
authorkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 14:55:42 +0000 (14:55 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 14:55:42 +0000 (14:55 +0000)
commit76c67a41c12a80138e984fa782d7396da53b8d32
tree5df0e23a10b29ee0dd31887919b8858253800296
parentd3f6814febb95f03af58543f4896599810f9b069
parent1c9e539b47ff594d75c9548a04e64cb0c61cff8c
Merge branch 'develop' into 'feature/staff-discovery-api'

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex